commit a69269a7117f799fcbe9ccde756b582e543d7e67
author Jerry Yu <jerry.h.yu@arm.com> Mon Jan 17 21:06:01 2022 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Tue Jan 25 12:46:17 2022 +0800
tree e16d316adca8253082062fdee837cc7f4d3e700d
parent 713013fa80e0ca75043e33de057035fb47fe5380

change sig_algs_len unit to byte

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 a6d6dee..bb2b47e 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3152,6 +3152,7 @@
 
 #if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED)
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
+#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
     /* Heap allocate and translate sig_hashes from internal hash identifiers to
        signature algorithms IANA identifiers.  */
     if ( mbedtls_ssl_conf_is_tls12_only( ssl->conf ) &&
@@ -3159,7 +3160,7 @@
     {
         const int *md;
         const int *sig_hashes = ssl->conf->sig_hashes;
-        size_t sig_algs_len = 0;
+        size_t sig_algs_len = sizeof( uint16_t );
         uint16_t *p;
 
         for( md = sig_hashes; *md != MBEDTLS_MD_NONE; md++ )
@@ -3167,18 +3168,17 @@
             if( mbedtls_ssl_hash_from_md_alg( *md ) == MBEDTLS_SSL_HASH_NONE )
                 continue;
     #if defined(MBEDTLS_ECDSA_C)
-            sig_algs_len++;
+            sig_algs_len += sizeof( uint16_t );
     #endif
     #if defined(MBEDTLS_RSA_C)
-            sig_algs_len++;
+            sig_algs_len += sizeof( uint16_t );
     #endif
         }
 
-        if( sig_algs_len == 0 )
+        if( sig_algs_len == sizeof( uint16_t ) )
             return( MBEDTLS_ERR_SSL_BAD_CONFIG );
 
-        ssl->handshake->sig_algs = mbedtls_calloc( sig_algs_len + 1,
-                                                   sizeof( uint16_t ) );
+        ssl->handshake->sig_algs = mbedtls_calloc( 1, sig_algs_len );
         if( ssl->handshake->sig_algs == NULL )
             return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
 
@@ -3201,6 +3201,7 @@
         ssl->handshake->sig_algs_heap_allocated = 1;
     }
     else
+#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
     {
         ssl->handshake->sig_algs = ssl->conf->sig_algs;
         ssl->handshake->sig_algs_heap_allocated = 0;