From 50f2f703a71d0c7bd8048cda3b37eb7d7d965394 Mon Sep 17 00:00:00 2001 From: Jerry Yu Date: Thu, 17 Feb 2022 15:02:57 +0800 Subject: [PATCH] remove extra guards Signed-off-by: Jerry Yu --- library/ssl_tls.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 633777251d..6a37af7035 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -7192,13 +7192,11 @@ static int ssl_tls12_populate_transform( mbedtls_ssl_transform *transform, - transform->maclen % cipher_info->block_size; } -#if defined(MBEDTLS_SSL_PROTO_TLS1_2) if( minor_ver == MBEDTLS_SSL_MINOR_VERSION_3 ) { transform->minlen += transform->ivlen; } else -#endif { MBEDTLS_SSL_DEBUG_MSG( 1, ( "should never happen" ) ); ret = MBEDTLS_ERR_SSL_INTERNAL_ERROR; @@ -7269,7 +7267,6 @@ static int ssl_tls12_populate_transform( mbedtls_ssl_transform *transform, } #if defined(MBEDTLS_SSL_SOME_SUITES_USE_MAC) -#if defined(MBEDTLS_SSL_PROTO_TLS1_2) /* For HMAC-based ciphersuites, initialize the HMAC transforms. For AEAD-based ciphersuites, there is nothing to do here. */ if( mac_key_len != 0 ) @@ -7281,7 +7278,6 @@ static int ssl_tls12_populate_transform( mbedtls_ssl_transform *transform, if( ret != 0 ) goto end; } -#endif #endif /* MBEDTLS_SSL_SOME_SUITES_USE_MAC */ ((void) mac_dec);