commit f2a942073e9c3d0a8e2cff78527d3fc33890a355
author XiaokangQian <xiaokang.qian@arm.com> Fri May 20 06:44:24 2022 +0000
committer XiaokangQian <xiaokang.qian@arm.com> Mon May 30 08:07:16 2022 +0000
tree 6d5929f116c6c481ba0825b8732331947880a9a4
parent 9b2b7716b083afe59bc1af7dfa567095f1b689b6

Fix SNI test failure

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

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 015c38a..f1f6e84 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -8247,7 +8247,7 @@
         return( 0 );
     }
 
-    MBEDTLS_SSL_DEBUG_MSG( 3, ( "Parse ServerName extension" ) );
+    MBEDTLS_SSL_DEBUG_MSG( 3, ( "parse ServerName extension" ) );
 
     MBEDTLS_SSL_CHK_BUF_READ_PTR( p, end, 2 );
     server_name_list_len = MBEDTLS_GET_UINT16_BE( p, 0 );
@@ -8264,11 +8264,15 @@
 
         if( p[0] == MBEDTLS_TLS_EXT_SERVERNAME_HOSTNAME )
         {
+            ssl->handshake->sni_name = p + 3;
+            ssl->handshake->sni_name_len = hostname_len;
+            if( ssl->conf->f_sni == NULL )
+                return( 0 );
             ret = ssl->conf->f_sni( ssl->conf->p_sni,
                                     ssl, p + 3, hostname_len );
             if( ret != 0 )
             {
-                MBEDTLS_SSL_DEBUG_RET( 1, "sni_wrapper", ret );
+                MBEDTLS_SSL_DEBUG_RET( 1, "ssl_sni_wrapper", ret );
                 mbedtls_ssl_send_alert_message(
                         ssl, MBEDTLS_SSL_ALERT_LEVEL_FATAL,
                         MBEDTLS_SSL_ALERT_MSG_UNRECOGNIZED_NAME );