commit 8840888fbc0ccb3b29b1e5769a59fe9150c46ce0
author XiaokangQian <xiaokang.qian@arm.com> Sat Apr 02 10:15:03 2022 +0000
committer XiaokangQian <xiaokang.qian@arm.com> Wed Apr 20 07:43:48 2022 +0000
tree 38c84e855b7adf76b815b0d6f7fca4e7154ae18a
parent c5763b5efd34bfe058f05fb224c8553a96e67173

Fix some CI issues

Change-Id: I68ee024f29b7b8dd586f2c45e91950657e76bad8
Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>

library/ssl_tls13_server.c

diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c
index 847f12d..934737a 100644
--- a/library/ssl_tls13_server.c
+++ b/library/ssl_tls13_server.c
@@ -147,7 +147,7 @@
      *       not observe handshake->curves already being allocated. */
     if( ssl->handshake->curves != NULL )
     {
-        mbedtls_free( ssl->handshake->curves );
+        //mbedtls_free( ssl->handshake->curves );
         ssl->handshake->curves = NULL;
     }
 
@@ -189,7 +189,7 @@
 }
 #endif /* MBEDTLS_ECDH_C || ( MBEDTLS_ECDSA_C */
 
-#if ( defined(MBEDTLS_ECDH_C) || defined(MBEDTLS_ECDSA_C) )
+#if defined(MBEDTLS_ECDH_C)
 /*
  *  ssl_tls13_parse_key_shares_ext() verifies whether the information in the
  *  extension is correct and stores the provided key shares. Whether this is an
@@ -242,7 +242,6 @@
     {
         uint16_t their_group;
         mbedtls_ecp_group_id their_curve;
-        mbedtls_ecp_curve_info const *their_curve_info;
         unsigned char const *end_of_share;
 
         /*
@@ -307,8 +306,7 @@
          * - Apply further curve checks
          */
 
-        their_curve_info = mbedtls_ecp_curve_info_from_grp_id( their_curve );
-        MBEDTLS_SSL_DEBUG_MSG( 2, ( "ECDH curve: %s", their_curve_info->name ) );
+        MBEDTLS_SSL_DEBUG_MSG( 2, ( "ECDH curve: %ud", their_curve ) );
 
         ret = mbedtls_ecdh_setup( &ssl->handshake->ecdh_ctx, their_curve );
         if( ret != 0 )
@@ -335,7 +333,7 @@
     }
     return( 0 );
 }
-#endif /* MBEDTLS_ECDH_C || MBEDTLS_ECDSA_C */
+#endif /* MBEDTLS_ECDH_C */
 
 #if defined(MBEDTLS_SSL_COOKIE_C)
 static int ssl_tls13_parse_cookie_ext( mbedtls_ssl_context *ssl,
@@ -345,7 +343,6 @@
     int ret = 0;
     size_t cookie_len;
     unsigned char const *p = buf;
-    mbedtls_ssl_handshake_params *handshake = ssl->handshake;
 
     MBEDTLS_SSL_DEBUG_MSG( 3, ( "parse cookie extension" ) );
 
@@ -364,13 +361,11 @@
                                        ssl->cli_id_len ) != 0 )
         {
             MBEDTLS_SSL_DEBUG_MSG( 2, ( "cookie verification failed" ) );
-            handshake->verify_cookie_len = 1;
             ret = MBEDTLS_ERR_SSL_HRR_REQUIRED;
         }
         else
         {
             MBEDTLS_SSL_DEBUG_MSG( 2, ( "cookie verification passed" ) );
-            handshake->verify_cookie_len = 0;
         }
     }
     else
@@ -722,7 +717,7 @@
                 break;
 #endif /* MBEDTLS_ECDH_C || MBEDTLS_ECDSA_C */
 
-#if ( defined(MBEDTLS_ECDH_C) || defined(MBEDTLS_ECDSA_C) )
+#if defined(MBEDTLS_ECDH_C)
             case MBEDTLS_TLS_EXT_KEY_SHARE:
                 MBEDTLS_SSL_DEBUG_MSG( 3, ( "found key share extension" ) );
 
@@ -745,7 +740,7 @@
 
                 ssl->handshake->extensions_present |= MBEDTLS_SSL_EXT_KEY_SHARE;
                 break;
-#endif /* MBEDTLS_ECDH_C || MBEDTLS_ECDSA_C */
+#endif /* MBEDTLS_ECDH_C */
 
             case MBEDTLS_TLS_EXT_SUPPORTED_VERSIONS:
                 MBEDTLS_SSL_DEBUG_MSG( 3, ( "found supported versions extension" ) );