yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-25 18:25:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

ssl_parse_server_key_exchange() cleanups

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-09-10 15:25:02 +00:00 committed by Paul Bakker
parent 5ee96546de
commit d92d6a1b5b
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/ssl_cli.c
View File

@ -1723,15 +1723,6 @@ static int ssl_parse_server_key_exchange( ssl_context *ssl )
int ret; int ret;
const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info; const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
unsigned char *p, *end; unsigned char *p, *end;
#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED) || \
defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) || \
defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
size_t sig_len, params_len;
unsigned char hash[64];
md_type_t md_alg = POLARSSL_MD_NONE;
size_t hashlen;
pk_type_t pk_alg = POLARSSL_PK_NONE;
#endif
SSL_DEBUG_MSG( 2, ( "=> parse server key exchange" ) ); SSL_DEBUG_MSG( 2, ( "=> parse server key exchange" ) );
@ -1864,8 +1855,12 @@ static int ssl_parse_server_key_exchange( ssl_context *ssl )
ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_RSA || ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_RSA ||
ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA ) ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA )
{ {
size_t sig_len, hashlen;
unsigned char hash[64];
md_type_t md_alg = POLARSSL_MD_NONE;
pk_type_t pk_alg = POLARSSL_PK_NONE;
unsigned char *params = ssl->in_msg + ssl_hs_hdr_len( ssl ); unsigned char *params = ssl->in_msg + ssl_hs_hdr_len( ssl );
params_len = p - params; size_t params_len = p - params;
/* /*
* Handle the digitally-signed structure * Handle the digitally-signed structure