commit 15b95a6c5276729e5929e9117afad204c538bd93
author Gabor Mezei <gabor.mezei@arm.com> Mon May 09 16:37:58 2022 +0200
committer Gabor Mezei <gabor.mezei@arm.com> Wed May 11 14:29:18 2022 +0200
tree 79b2059c759b365a0a78abda278791c168df6649
parent 1a3be088bfdd235327f7dcdf7b39caae95f23e74

Use common macro for the invalid signiture algorithm botn in TLS 1.2 and 1.3

Introduce a new macro MBEDTLS_TLS_SIG_NONE for invalid signiture algorithm.
It is intended to use in common code of TLS 1.2 and 1.3.

Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index daddc5a..3299159 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -847,7 +847,7 @@
             p++;
 #endif
         }
-        *p = MBEDTLS_TLS1_3_SIG_NONE;
+        *p = MBEDTLS_TLS_SIG_NONE;
         ssl->handshake->sig_algs_heap_allocated = 1;
     }
     else
@@ -4138,7 +4138,7 @@
     MBEDTLS_TLS1_3_SIG_RSA_PKCS1_SHA256,
 #endif /* MBEDTLS_RSA_C && MBEDTLS_SHA256_C */
 
-    MBEDTLS_TLS1_3_SIG_NONE
+    MBEDTLS_TLS_SIG_NONE
 };
 
 /* NOTICE: see above */
@@ -4153,7 +4153,7 @@
 #if defined(MBEDTLS_SHA256_C)
     MBEDTLS_SSL_SIG_ALG_SET( MBEDTLS_SSL_HASH_SHA256 )
 #endif
-    MBEDTLS_TLS1_3_SIG_NONE
+    MBEDTLS_TLS_SIG_NONE
 };
 #endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
 /* NOTICE: see above */
@@ -4179,7 +4179,7 @@
     MBEDTLS_TLS1_3_SIG_RSA_PKCS1_SHA256,
 #endif /* MBEDTLS_RSA_C && MBEDTLS_SHA256_C */
 
-    MBEDTLS_TLS1_3_SIG_NONE
+    MBEDTLS_TLS_SIG_NONE
 };
 
 /* NOTICE: see above */
@@ -4191,7 +4191,7 @@
 #if defined(MBEDTLS_SHA384_C)
     MBEDTLS_SSL_SIG_ALG_SET( MBEDTLS_SSL_HASH_SHA384 )
 #endif
-    MBEDTLS_TLS1_3_SIG_NONE
+    MBEDTLS_TLS_SIG_NONE
 };
 #endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
 
@@ -4215,7 +4215,7 @@
     size_t i, j;
     int ret = 0;
 
-    for( i = 0; sig_algs[i] != MBEDTLS_TLS1_3_SIG_NONE; i++ )
+    for( i = 0; sig_algs[i] != MBEDTLS_TLS_SIG_NONE; i++ )
     {
         for( j = 0; j < i; j++ )
         {
@@ -4944,7 +4944,7 @@
         return( MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE );
     }
 
-    ssl->handshake->received_sig_algs[common_idx] = MBEDTLS_TLS1_3_SIG_NONE;
+    ssl->handshake->received_sig_algs[common_idx] = MBEDTLS_TLS_SIG_NONE;
     return( 0 );
 }
 
@@ -7660,8 +7660,7 @@
     unsigned int i;
     uint16_t sig_alg = mbedtls_ssl_sig_from_pk_alg( pk_alg );
     uint16_t *set = ssl->handshake->received_sig_algs;
-    uint16_t invalid_sig_alg = MBEDTLS_SSL_SIG_ALG( MBEDTLS_SSL_SIG_ANON,
-                                                    MBEDTLS_SSL_HASH_NONE );
+    uint16_t invalid_sig_alg = MBEDTLS_TLS_SIG_NONE;
 
     if( sig_alg == MBEDTLS_SSL_SIG_ANON )
         return( MBEDTLS_MD_NONE );