lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-28 00:21:48 +03:00
Code Activity

Improve a variable's name

Browse Source 
Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
This commit is contained in:
Manuel Pégourié-Gonnard
2024-08-14 12:52:59 +02:00
parent 523a7e4aaf
commit e910ac8627
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/ssl_tls.c
View File

@ -7947,7 +7947,7 @@ static int ssl_parse_certificate_verify(mbedtls_ssl_context *ssl,
int ret = 0; int ret = 0;
const mbedtls_ssl_ciphersuite_t *ciphersuite_info = const mbedtls_ssl_ciphersuite_t *ciphersuite_info =
ssl->handshake->ciphersuite_info; ssl->handshake->ciphersuite_info;
int have_ca_chain = 0; int have_ca_chain_or_callback = 0;
if (authmode == MBEDTLS_SSL_VERIFY_NONE) { if (authmode == MBEDTLS_SSL_VERIFY_NONE) {
return 0; return 0;
@ -7971,7 +7971,7 @@ static int ssl_parse_certificate_verify(mbedtls_ssl_context *ssl,
#if defined(MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK) #if defined(MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK)
if (ssl->conf->f_ca_cb != NULL) { if (ssl->conf->f_ca_cb != NULL) {
((void) rs_ctx); ((void) rs_ctx);
have_ca_chain = 1; have_ca_chain_or_callback = 1;
MBEDTLS_SSL_DEBUG_MSG(3, ("use CA callback for X.509 CRT verification")); MBEDTLS_SSL_DEBUG_MSG(3, ("use CA callback for X.509 CRT verification"));
ret = mbedtls_x509_crt_verify_with_ca_cb( ret = mbedtls_x509_crt_verify_with_ca_cb(
@ -7999,7 +7999,7 @@ static int ssl_parse_certificate_verify(mbedtls_ssl_context *ssl,
} }
if (ca_chain != NULL) { if (ca_chain != NULL) {
have_ca_chain = 1; have_ca_chain_or_callback = 1;
} }
ret = mbedtls_x509_crt_verify_restartable( ret = mbedtls_x509_crt_verify_restartable(
@ -8061,7 +8061,7 @@ static int ssl_parse_certificate_verify(mbedtls_ssl_context *ssl,
ret = 0; ret = 0;
} }
if (have_ca_chain == 0 && authmode == MBEDTLS_SSL_VERIFY_REQUIRED) { if (have_ca_chain_or_callback == 0 && authmode == MBEDTLS_SSL_VERIFY_REQUIRED) {
MBEDTLS_SSL_DEBUG_MSG(1, ("got no CA chain")); MBEDTLS_SSL_DEBUG_MSG(1, ("got no CA chain"));
ret = MBEDTLS_ERR_SSL_CA_CHAIN_REQUIRED; ret = MBEDTLS_ERR_SSL_CA_CHAIN_REQUIRED;
} }

8
library/ssl_tls13_generic.c
View File

@ -629,7 +629,7 @@ MBEDTLS_CHECK_RETURN_CRITICAL
static int ssl_tls13_validate_certificate(mbedtls_ssl_context *ssl) static int ssl_tls13_validate_certificate(mbedtls_ssl_context *ssl)
{ {
int ret = 0; int ret = 0;
int have_ca_chain = 0; int have_ca_chain_or_callback = 0;
uint32_t verify_result = 0; uint32_t verify_result = 0;
/* Authmode: precedence order is SNI if used else configuration */ /* Authmode: precedence order is SNI if used else configuration */
@ -700,7 +700,7 @@ static int ssl_tls13_validate_certificate(mbedtls_ssl_context *ssl)
*/ */
#if defined(MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK) #if defined(MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK)
if (ssl->conf->f_ca_cb != NULL) { if (ssl->conf->f_ca_cb != NULL) {
have_ca_chain = 1; have_ca_chain_or_callback = 1;
MBEDTLS_SSL_DEBUG_MSG(3, ("use CA callback for X.509 CRT verification")); MBEDTLS_SSL_DEBUG_MSG(3, ("use CA callback for X.509 CRT verification"));
ret = mbedtls_x509_crt_verify_with_ca_cb( ret = mbedtls_x509_crt_verify_with_ca_cb(
@ -728,7 +728,7 @@ static int ssl_tls13_validate_certificate(mbedtls_ssl_context *ssl)
} }
if (ca_chain != NULL) { if (ca_chain != NULL) {
have_ca_chain = 1; have_ca_chain_or_callback = 1;
} }
ret = mbedtls_x509_crt_verify_with_profile( ret = mbedtls_x509_crt_verify_with_profile(
@ -771,7 +771,7 @@ static int ssl_tls13_validate_certificate(mbedtls_ssl_context *ssl)
ret = 0; ret = 0;
} }
if (!have_ca_chain && authmode == MBEDTLS_SSL_VERIFY_REQUIRED) { if (!have_ca_chain_or_callback && authmode == MBEDTLS_SSL_VERIFY_REQUIRED) {
MBEDTLS_SSL_DEBUG_MSG(1, ("got no CA chain")); MBEDTLS_SSL_DEBUG_MSG(1, ("got no CA chain"));
ret = MBEDTLS_ERR_SSL_CA_CHAIN_REQUIRED; ret = MBEDTLS_ERR_SSL_CA_CHAIN_REQUIRED;
} }