yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-05-05 06:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor issues and clean up the code

Browse source 
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
This commit is contained in:
Andrzej Kurek 2020-12-18 15:06:42 -05:00
parent e2134ed4b1
commit e6c3aa7e7b
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
library/ssl_cli.c
View file

@ -3668,7 +3668,8 @@ static int ssl_out_client_key_exchange_write( mbedtls_ssl_context *ssl,
*p++ = 0x04; /* uncompressed point presentation */ *p++ = 0x04; /* uncompressed point presentation */
#if defined(MBEDTLS_EARLY_KEY_COMPUTATION) #if defined(MBEDTLS_EARLY_KEY_COMPUTATION)
memcpy( p, ssl->handshake->ecdh_publickey, 2 * NUM_ECC_BYTES ); mbedtls_platform_memcpy( p, ssl->handshake->ecdh_publickey,
2 * NUM_ECC_BYTES );
#else #else
ret = uECC_make_key( p, ssl->handshake->ecdh_privkey ); ret = uECC_make_key( p, ssl->handshake->ecdh_privkey );
if( ret == UECC_FAULT_DETECTED ) if( ret == UECC_FAULT_DETECTED )
@ -4227,11 +4228,10 @@ static int ssl_parse_new_session_ticket( mbedtls_ssl_context *ssl )
*/ */
int mbedtls_ssl_handshake_client_step( mbedtls_ssl_context *ssl ) int mbedtls_ssl_handshake_client_step( mbedtls_ssl_context *ssl )
{ {
int ret = 0; int ret = MBEDTLS_ERR_PLATFORM_FAULT_DETECTED;
#if defined(MBEDTLS_DELAYED_SERVER_CERT_VERIFICATION) #if defined(MBEDTLS_DELAYED_SERVER_CERT_VERIFICATION)
void *rs_ctx = NULL; void *rs_ctx = NULL;
int authmode; int authmode;
mbedtls_x509_crt *chain = NULL;
#endif /* MBEDTLS_DELAYED_SERVER_CERT_VERIFICATION */ #endif /* MBEDTLS_DELAYED_SERVER_CERT_VERIFICATION */
if( ssl->state == MBEDTLS_SSL_HANDSHAKE_OVER || ssl->handshake == NULL ) if( ssl->state == MBEDTLS_SSL_HANDSHAKE_OVER || ssl->handshake == NULL )
@ -4347,16 +4347,11 @@ int mbedtls_ssl_handshake_client_step( mbedtls_ssl_context *ssl )
#else #else
authmode = mbedtls_ssl_conf_get_authmode( ssl->conf ); authmode = mbedtls_ssl_conf_get_authmode( ssl->conf );
#endif #endif
/* authmode = ssl->handshake->sni_authmode != MBEDTLS_SSL_VERIFY_UNSET
? ssl->handshake->sni_authmode
: ssl->conf->authmode;
*/
chain = ssl->session_negotiate->peer_cert;
MBEDTLS_SSL_DEBUG_MSG( 3, ( "execute delayed server certificate verification" ) ); MBEDTLS_SSL_DEBUG_MSG( 3, ( "execute delayed server certificate verification" ) );
ret = mbedtls_ssl_parse_delayed_certificate_verify( ssl, authmode, ret = mbedtls_ssl_parse_delayed_certificate_verify( ssl, authmode,
chain, rs_ctx ); ssl->session_negotiate->peer_cert, rs_ctx );
if( ret != 0 ) if( ret != 0 )
break; break;
#endif /* MBEDTLS_DELAYED_SERVER_CERT_VERIFICATION */ #endif /* MBEDTLS_DELAYED_SERVER_CERT_VERIFICATION */