lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-05 19:35:48 +03:00
Code Activity

Remove non-PSA code in mbedtls_ssl_tls13_generate_handshake_keys/mbedtls_ssl_tls13_generate_application_keys

Browse Source 
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
Neil Armstrong
2022-05-17 09:11:45 +02:00
parent 93617245c3
commit e3b0b8ab67
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
library/ssl_tls13_keys.c
View File

@@ -1203,15 +1203,11 @@ int mbedtls_ssl_tls13_generate_handshake_keys( mbedtls_ssl_context *ssl,
unsigned char transcript[MBEDTLS_TLS1_3_MD_MAX_SIZE]; unsigned char transcript[MBEDTLS_TLS1_3_MD_MAX_SIZE];
size_t transcript_len; size_t transcript_len;
#if defined(MBEDTLS_USE_PSA_CRYPTO)
psa_key_type_t key_type; psa_key_type_t key_type;
psa_algorithm_t alg; psa_algorithm_t alg;
size_t key_bits; size_t key_bits;
size_t taglen; size_t taglen;
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
#else
mbedtls_cipher_info_t const *cipher_info;
#endif /* MBEDTLS_USE_PSA_CRYPTO */
size_t key_len, iv_len; size_t key_len, iv_len;
mbedtls_ssl_handshake_params *handshake = ssl->handshake; mbedtls_ssl_handshake_params *handshake = ssl->handshake;
@@ -1220,7 +1216,6 @@ int mbedtls_ssl_tls13_generate_handshake_keys( mbedtls_ssl_context *ssl,
MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> mbedtls_ssl_tls13_generate_handshake_keys" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> mbedtls_ssl_tls13_generate_handshake_keys" ) );
#if defined(MBEDTLS_USE_PSA_CRYPTO)
if( ciphersuite_info->flags & MBEDTLS_CIPHERSUITE_SHORT_TAG ) if( ciphersuite_info->flags & MBEDTLS_CIPHERSUITE_SHORT_TAG )
taglen = 8; taglen = 8;
else else
@@ -1241,11 +1236,6 @@ int mbedtls_ssl_tls13_generate_handshake_keys( mbedtls_ssl_context *ssl,
iv_len = 12; iv_len = 12;
else else
iv_len = PSA_CIPHER_IV_LENGTH( key_type, alg ); iv_len = PSA_CIPHER_IV_LENGTH( key_type, alg );
#else
cipher_info = mbedtls_cipher_info_from_type( ciphersuite_info->cipher );
key_len = cipher_info->key_bitlen >> 3;
iv_len = cipher_info->iv_size;
#endif /* MBEDTLS_USE_PSA_CRYPTO */
md_type = ciphersuite_info->mac; md_type = ciphersuite_info->mac;
@@ -1439,22 +1429,17 @@ int mbedtls_ssl_tls13_generate_application_keys(
size_t hash_len; size_t hash_len;
/* Variables relating to the cipher for the chosen ciphersuite. */ /* Variables relating to the cipher for the chosen ciphersuite. */
#if defined(MBEDTLS_USE_PSA_CRYPTO)
psa_key_type_t key_type; psa_key_type_t key_type;
psa_algorithm_t alg; psa_algorithm_t alg;
size_t key_bits; size_t key_bits;
size_t taglen; size_t taglen;
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
#else
mbedtls_cipher_info_t const *cipher_info;
#endif /* MBEDTLS_USE_PSA_CRYPTO */
size_t key_len, iv_len; size_t key_len, iv_len;
MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> derive application traffic keys" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> derive application traffic keys" ) );
/* Extract basic information about hash and ciphersuite */ /* Extract basic information about hash and ciphersuite */
#if defined(MBEDTLS_USE_PSA_CRYPTO)
if( handshake->ciphersuite_info->flags & MBEDTLS_CIPHERSUITE_SHORT_TAG ) if( handshake->ciphersuite_info->flags & MBEDTLS_CIPHERSUITE_SHORT_TAG )
taglen = 8; taglen = 8;
else else
@@ -1475,12 +1460,6 @@ int mbedtls_ssl_tls13_generate_application_keys(
iv_len = 12; iv_len = 12;
else else
iv_len = PSA_CIPHER_IV_LENGTH( key_type, alg ); iv_len = PSA_CIPHER_IV_LENGTH( key_type, alg );
#else
cipher_info = mbedtls_cipher_info_from_type(
handshake->ciphersuite_info->cipher );
key_len = cipher_info->key_bitlen / 8;
iv_len = cipher_info->iv_size;
#endif /* MBEDTLS_USE_PSA_CRYPTO */
md_type = handshake->ciphersuite_info->mac; md_type = handshake->ciphersuite_info->mac;