commit bef175db96c6dd37fae2858a2ebecf71a8d6666d
author Jerry Yu <jerry.h.yu@arm.com> Fri Jan 28 10:52:05 2022 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Mon Feb 21 09:06:00 2022 +0800
tree c5dee040f7f2ebf7c37f6f52f7f7e2c173e230da
parent cc43c6bee5c0f18cc53adda07eed3523394ed9b8

Wrap derive_keys with TLS1_2 option

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>

library/ssl_misc.h

diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 4b399eb..0656439 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -1140,7 +1140,10 @@
 int mbedtls_ssl_send_fatal_handshake_failure( mbedtls_ssl_context *ssl );
 
 void mbedtls_ssl_reset_checksum( mbedtls_ssl_context *ssl );
+
+#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
 int mbedtls_ssl_derive_keys( mbedtls_ssl_context *ssl );
+#endif /* MBEDTLS_SSL_PROTO_TLS1_2  */
 
 int mbedtls_ssl_handle_message_type( mbedtls_ssl_context *ssl );
 int mbedtls_ssl_prepare_handshake_record( mbedtls_ssl_context *ssl );

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 5baff0c..4dd885f 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1114,6 +1114,7 @@
     return( ret );
 }
 
+#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
 /*
  * Set appropriate PRF function and other SSL / TLS1.2 functions
  *
@@ -1128,12 +1129,6 @@
                                    int minor_ver,
                                    mbedtls_md_type_t hash )
 {
-#if !defined(MBEDTLS_SSL_PROTO_TLS1_2) || !defined(MBEDTLS_SHA384_C)
-    (void) hash;
-    (void) minor_ver;
-    (void) handshake;
-#endif
-#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
 
 #if defined(MBEDTLS_SHA384_C)
     if( minor_ver == MBEDTLS_SSL_MINOR_VERSION_3 &&
@@ -1155,9 +1150,12 @@
     else
 #endif
     {
+        (void) hash;
+        (void) minor_ver;
+        (void) handshake;
         return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
     }
-#endif /* MBEDTLS_SSL_PROTO_TLS1_2  */
+
 
     return( 0 );
 }
@@ -1371,7 +1369,6 @@
     return( 0 );
 }
 
-#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
 #if defined(MBEDTLS_SHA256_C)
 void ssl_calc_verify_tls_sha256( const mbedtls_ssl_context *ssl,
                                  unsigned char *hash,