commit c3091b1c8c0acb2152d931c508138600a6235fec
author Jerry Yu <jerry.h.yu@arm.com> Thu Dec 23 14:57:39 2021 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Mon Feb 21 09:06:00 2022 +0800
tree 7c725ae52a7af3e7cf0c2bb8c60b7a007eec3420
parent e0a6412d8ded518e0b38b8610b2bbc7d639b177a

tls13_only: compile pass

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

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index ae6f635..24afbe4 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -632,6 +632,7 @@
     else
 #endif
 #endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
+    ((void) tls_prf);
     return( MBEDTLS_SSL_TLS_PRF_NONE );
 }
 
@@ -1121,8 +1122,11 @@
                                    int minor_ver,
                                    mbedtls_md_type_t hash )
 {
-#if !defined(MBEDTLS_SSL_PROTO_TLS1_2) || !defined(MBEDTLS_SHA384_C)
+#if !defined(MBEDTLS_SSL_PROTO_TLS1_2) || \
+    !( defined(MBEDTLS_SHA384_C) || defined(MBEDTLS_SHA256_C) )
     (void) hash;
+    (void) handshake;
+    (void) minor_ver;
 #endif
 
 #if defined(MBEDTLS_SSL_PROTO_TLS1_2)
@@ -2001,9 +2005,8 @@
         MBEDTLS_SSL_DEBUG_MSG( 1, ( "TLSv1 client has no certificate" ) );
         return( 0 );
     }
-
-    return( -1 );
 #endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
+    return( -1 );
 }
 #endif /* MBEDTLS_SSL_SRV_C */
 
@@ -2458,6 +2461,7 @@
 
 void mbedtls_ssl_reset_checksum( mbedtls_ssl_context *ssl )
 {
+    ((void) ssl);
 #if defined(MBEDTLS_SSL_PROTO_TLS1_2)
 #if defined(MBEDTLS_SHA256_C)
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
@@ -2481,6 +2485,9 @@
 static void ssl_update_checksum_start( mbedtls_ssl_context *ssl,
                                        const unsigned char *buf, size_t len )
 {
+    ((void) ssl);
+    ((void) buf);
+    ((void) len);
 #if defined(MBEDTLS_SSL_PROTO_TLS1_2)
 #if defined(MBEDTLS_SHA256_C)
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
@@ -5198,6 +5205,7 @@
     return( ssl_session_save( session, 0, buf, buf_len, olen ) );
 }
 
+#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
 /*
  * Deserialize session, see mbedtls_ssl_session_save() for format.
  *
@@ -5402,6 +5410,7 @@
 
     return( 0 );
 }
+#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
 
 static int ssl_session_load( mbedtls_ssl_session *session,
                              unsigned char omit_header,
@@ -6212,6 +6221,10 @@
                            unsigned char *dstbuf, size_t dlen );
 static tls_prf_fn ssl_tls12prf_from_cs( int ciphersuite_id )
 {
+#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
+/* TODO: This function has some problem when
+    !MBEDTLS_SHA384_C && !MBEDTLS_SHA256_C && MBEDTLS_SHA512_C
+*/
 #if defined(MBEDTLS_SHA384_C)
     const mbedtls_ssl_ciphersuite_t * const ciphersuite_info =
          mbedtls_ssl_ciphersuite_from_id( ciphersuite_id );
@@ -6222,6 +6235,11 @@
     (void) ciphersuite_id;
 #endif
     return( tls_prf_sha256 );
+#else
+    ((void) ciphersuite_id);
+    return NULL;
+#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
+
 }
 
 /*
@@ -7593,16 +7611,21 @@
 #if defined(MBEDTLS_SHA384_C)
     case MBEDTLS_MD_SHA384:
         return( ssl_get_handshake_transcript_sha384( ssl, dst, dst_len, olen ) );
-#endif /* MBEDTLS_SHA384_C */
+#endif /* MBEDTLS_SHA384_C && MBEDTLS_SSL_PROTO_TLS1_2 */
 
 #if defined(MBEDTLS_SHA256_C)
     case MBEDTLS_MD_SHA256:
         return( ssl_get_handshake_transcript_sha256( ssl, dst, dst_len, olen ) );
-#endif /* MBEDTLS_SHA256_C */
+#endif /* MBEDTLS_SHA256_C && MBEDTLS_SSL_PROTO_TLS1_2*/
 
     default:
         break;
     }
+    ((void) ssl);
+    ((void) md);
+    ((void) dst);
+    ((void) dst_len);
+    ((void) olen);
     return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
 }