eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wrapper function for calling parse_certificate_verify

Browse source
This commit is contained in:
Hannes Tschofenig 2020-12-03 15:48:55 +01:00
parent 635f86874f
commit cb6410c67d
1 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

42
library/ssl_tls.c
View file

@ -7972,6 +7972,26 @@ static int ssl_parse_certificate_verify( mbedtls_ssl_context *ssl,
return( verify_ret ); return( verify_ret );
} }
#if defined(MBEDTLS_KEY_EXCHANGE__WITH_CERT__ENABLED) && defined(MBEDTLS_DELAYED_SERVER_CERT_VERIFICATION)
/* ssl_parse_delayed_certificate_verify() defines a wrapper around ssl_parse_certificate_verify
* to call it in ssl_cli.c rather than purely internal to ssl_tls.c.
*/
int ssl_parse_delayed_certificate_verify( mbedtls_ssl_context *ssl,
int authmode,
mbedtls_x509_crt *chain,
void *rs_ctx )
{
return( ssl_parse_certificate_verify( ssl,
authmode,
chain,
rs_ctx ) );
}
#endif /* MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED && MBEDTLS_DELAYED_SERVER_CERT_VERIFICATION */
#if !defined(MBEDTLS_SSL_KEEP_PEER_CERTIFICATE) #if !defined(MBEDTLS_SSL_KEEP_PEER_CERTIFICATE)
#if defined(MBEDTLS_SSL_RENEGOTIATION) #if defined(MBEDTLS_SSL_RENEGOTIATION)
@ -8112,10 +8132,19 @@ crt_verify:
rs_ctx = &ssl->handshake->ecrs_ctx; rs_ctx = &ssl->handshake->ecrs_ctx;
#endif #endif
ret = ssl_parse_certificate_verify( ssl, authmode, #if defined(MBEDTLS_DELAYED_SERVER_CERT_VERIFICATION)
chain, rs_ctx ); if (mbedtls_ssl_conf_get_endpoint( ssl->conf ) == MBEDTLS_SSL_IS_CLIENT )
if( ret != 0 ) {
goto exit; MBEDTLS_SSL_DEBUG_MSG( 3, ( "delay server certificate verification" ) );
}
else
#endif /* MBEDTLS_DELAYED_SERVER_CERT_VERIFICATION */
{
ret = ssl_parse_certificate_verify( ssl, authmode,
chain, rs_ctx );
if( ret != 0 )
goto exit;
}
#if !defined(MBEDTLS_SSL_KEEP_PEER_CERTIFICATE) #if !defined(MBEDTLS_SSL_KEEP_PEER_CERTIFICATE)
{ {
@ -12013,6 +12042,11 @@ void mbedtls_ssl_handshake_free( mbedtls_ssl_context *ssl )
#endif #endif
#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */ #endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
#if defined(MBEDTLS_SSL_FREE_SERVER_CERTIFICATE)
mbedtls_free( ssl->session->peer_cert );
ssl->session->peer_cert = NULL;
#endif /* MBEDTLS_SSL_FREE_SERVER_CERTIFICATE */
#if defined(MBEDTLS_DHM_C) #if defined(MBEDTLS_DHM_C)
mbedtls_dhm_free( &handshake->dhm_ctx ); mbedtls_dhm_free( &handshake->dhm_ctx );
#endif #endif