yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-02-25 08:26:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

tinyCrypt: Hardcode ECDH parameter header

Browse source 
Saves a few bytes of code when tinyCrypt is used.
This commit is contained in:
Hanno Becker 2019-07-23 15:59:58 +01:00
parent d089fad925
commit d849c7ca19
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
library/ssl_srv.c
View file

@ -3384,8 +3384,22 @@ static int ssl_prepare_server_key_exchange( mbedtls_ssl_context *ssl,
*/ */
#if defined(MBEDTLS_USE_TINYCRYPT) #if defined(MBEDTLS_USE_TINYCRYPT)
if( ssl->handshake->curve_tls_id != 23 ) static const uint16_t secp256r1_tls_id = 23;
static const unsigned char ecdh_param_hdr[] = {
MBEDTLS_ECP_TLS_NAMED_CURVE,
( secp256r1_tls_id >> 8 ) & 0xFF,
( secp256r1_tls_id >> 0 ) & 0xFF,
2 * NUM_ECC_BYTES + 1,
0x04 /* Uncompressed */
};
if( ssl->handshake->curve_tls_id != secp256r1_tls_id )
{
MBEDTLS_SSL_DEBUG_MSG( 1, ( "Unsupported curve %u (expected %u)",
(unsigned) ssl->handshake->curve_tls_id,
secp256r1_tls_id ) );
return( MBEDTLS_ERR_SSL_NO_CIPHER_CHOSEN ); return( MBEDTLS_ERR_SSL_NO_CIPHER_CHOSEN );
}
if( !uECC_make_key( ssl->handshake->ecdh_ownpubkey, if( !uECC_make_key( ssl->handshake->ecdh_ownpubkey,
ssl->handshake->ecdh_privkey, ssl->handshake->ecdh_privkey,
@ -3395,24 +3409,17 @@ static int ssl_prepare_server_key_exchange( mbedtls_ssl_context *ssl,
return( MBEDTLS_ERR_SSL_INTERNAL_ERROR ); return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
} }
/* #if defined(MBEDTLS_KEY_EXCHANGE__WITH_SERVER_SIGNATURE__ENABLED)
* First byte is curve_type, always named_curve dig_signed = ssl->out_msg + ssl->out_msglen;
*/ #endif
ssl->out_msg[ssl->out_msglen++] = MBEDTLS_ECP_TLS_NAMED_CURVE;
/* memcpy( ssl->out_msg + ssl->out_msglen,
* Next two bytes are the namedcurve value ecdh_param_hdr, sizeof( ecdh_param_hdr ) );
*/ ssl->out_msglen += sizeof( ecdh_param_hdr );
ssl->out_msg[ssl->out_msglen++] = ssl->handshake->curve_tls_id >> 8;
ssl->out_msg[ssl->out_msglen++] = ssl->handshake->curve_tls_id & 0xFF;
/* Write the public key length */
ssl->out_msg[ssl->out_msglen++] = 2*NUM_ECC_BYTES;
memcpy( &ssl->out_msg[ssl->out_msglen], memcpy( &ssl->out_msg[ssl->out_msglen],
ssl->handshake->ecdh_ownpubkey, ssl->handshake->ecdh_ownpubkey,
2*NUM_ECC_BYTES ); 2*NUM_ECC_BYTES );
ssl->out_msglen += 2*NUM_ECC_BYTES; ssl->out_msglen += 2*NUM_ECC_BYTES;
#else /* MBEDTLS_USE_TINYCRYPT */ #else /* MBEDTLS_USE_TINYCRYPT */