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_generic.c

diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index bc992c9..18a66ec 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -1515,6 +1515,7 @@
 #define ECDH_VALIDATE_RET( cond )    \
     MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_ECP_BAD_INPUT_DATA )
 
+#if !defined(MBEDTLS_ECDH_LEGACY_CONTEXT)
 static int ecdh_import_public_raw( mbedtls_ecdh_context_mbed *ctx,
                                    const unsigned char *buf,
                                    const unsigned char *end )
@@ -1522,6 +1523,7 @@
     return( mbedtls_ecp_point_read_binary( &ctx->grp, &ctx->Qp,
                                            buf, end - buf ) );
 }
+#endif /* MBEDTLS_ECDH_LEGACY_CONTEXT */
 
 #if defined(MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED)
 static int everest_import_public_raw( mbedtls_x25519_context *ctx,
@@ -1543,24 +1545,26 @@
     ECDH_VALIDATE_RET( ctx != NULL );
     ECDH_VALIDATE_RET( buf != NULL );
     ECDH_VALIDATE_RET( end != NULL );
-
 #if defined(MBEDTLS_ECDH_LEGACY_CONTEXT)
-    return( ecdh_import_public_raw( ctx, buf, end ) );
+    ((void) ctx);
+    ((void) buf);
+    ((void) end);
+    return ( 0 );
 #else
     switch( ctx->var )
     {
 #if defined(MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED)
         case MBEDTLS_ECDH_VARIANT_EVEREST:
-            return( everest_import_public_raw( &ctx->ctx.everest_ecdh,
+            return( everest_import_public_raw( &ctx->ctx.everest_ecdh.ctx,
                                                buf, end) );
-#endif
+#endif /* MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED */
         case MBEDTLS_ECDH_VARIANT_MBEDTLS_2_0:
             return( ecdh_import_public_raw( &ctx->ctx.mbed_ecdh,
                                             buf, end ) );
         default:
             return MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
     }
-#endif
+#endif /* MBEDTLS_ECDH_LEGACY_CONTEXT */
 }
 
 #endif /* MBEDTLS_SSL_TLS_C && MBEDTLS_SSL_PROTO_TLS1_3 */