mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-10-01 22:47:23 +00:00
Merge pull request #10497 from JuhaPekkaa/juke/loglevel-change-3.6
Update log level for mbedtls_ssl_check_record and PSA-based ECDH computation (3.6)
This commit is contained in:
+2
-2
@@ -321,7 +321,7 @@ int mbedtls_ssl_check_record(mbedtls_ssl_context const *ssl,
|
|||||||
size_t buflen)
|
size_t buflen)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
MBEDTLS_SSL_DEBUG_MSG(1, ("=> mbedtls_ssl_check_record"));
|
MBEDTLS_SSL_DEBUG_MSG(3, ("=> mbedtls_ssl_check_record"));
|
||||||
MBEDTLS_SSL_DEBUG_BUF(3, "record buffer", buf, buflen);
|
MBEDTLS_SSL_DEBUG_BUF(3, "record buffer", buf, buflen);
|
||||||
|
|
||||||
/* We don't support record checking in TLS because
|
/* We don't support record checking in TLS because
|
||||||
@@ -363,7 +363,7 @@ exit:
|
|||||||
ret = MBEDTLS_ERR_SSL_UNEXPECTED_RECORD;
|
ret = MBEDTLS_ERR_SSL_UNEXPECTED_RECORD;
|
||||||
}
|
}
|
||||||
|
|
||||||
MBEDTLS_SSL_DEBUG_MSG(1, ("<= mbedtls_ssl_check_record"));
|
MBEDTLS_SSL_DEBUG_MSG(3, ("<= mbedtls_ssl_check_record"));
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2764,7 +2764,7 @@ static int ssl_write_client_key_exchange(mbedtls_ssl_context *ssl)
|
|||||||
|
|
||||||
header_len = 4;
|
header_len = 4;
|
||||||
|
|
||||||
MBEDTLS_SSL_DEBUG_MSG(1, ("Perform PSA-based ECDH computation."));
|
MBEDTLS_SSL_DEBUG_MSG(3, ("Perform PSA-based ECDH computation."));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Generate EC private key for ECDHE exchange.
|
* Generate EC private key for ECDHE exchange.
|
||||||
@@ -2936,7 +2936,7 @@ ecdh_calc_secret:
|
|||||||
|
|
||||||
header_len += ssl->conf->psk_identity_len;
|
header_len += ssl->conf->psk_identity_len;
|
||||||
|
|
||||||
MBEDTLS_SSL_DEBUG_MSG(1, ("Perform PSA-based ECDH computation."));
|
MBEDTLS_SSL_DEBUG_MSG(3, ("Perform PSA-based ECDH computation."));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Generate EC private key for ECDHE exchange.
|
* Generate EC private key for ECDHE exchange.
|
||||||
|
|||||||
@@ -2982,7 +2982,7 @@ curve_matching_done:
|
|||||||
psa_key_type_t key_type = PSA_KEY_TYPE_NONE;
|
psa_key_type_t key_type = PSA_KEY_TYPE_NONE;
|
||||||
size_t ec_bits = 0;
|
size_t ec_bits = 0;
|
||||||
|
|
||||||
MBEDTLS_SSL_DEBUG_MSG(1, ("Perform PSA-based ECDH computation."));
|
MBEDTLS_SSL_DEBUG_MSG(3, ("Perform PSA-based ECDH computation."));
|
||||||
|
|
||||||
/* Convert EC's TLS ID to PSA key type. */
|
/* Convert EC's TLS ID to PSA key type. */
|
||||||
if (mbedtls_ssl_get_psa_curve_info_from_tls_id(*curr_tls_id,
|
if (mbedtls_ssl_get_psa_curve_info_from_tls_id(*curr_tls_id,
|
||||||
|
|||||||
Reference in New Issue
Block a user