From 32f5cc6dd4ba0612ee2f7cdafddb854903db5ec8 Mon Sep 17 00:00:00 2001 From: Jaeden Amero Date: Thu, 26 Apr 2018 10:43:28 +0100 Subject: [PATCH] ssl_cli: Fix all.sh test failure for ECJPAKE typo When the "same ciphersuite validation" was backported to 2.1, we introduced the use of irrelevant defines in ssl_cli.c. all.sh catches these as "Likely typos". Remove the code for ECJPAKE, a feature that doesn't exist in 2.1, from ssl_cli to fix this test failure. ****************************************************************** * test/build: declared and exported names * Thu Apr 26 08:23:19 UTC 2018 ****************************************************************** 1175 macros 143 enum-consts 942 identifiers 771 exported-symbols Exported symbols declared in header: PASS Names of actual-macros: PASS Names of enum-consts: PASS Names of identifiers: PASS Likely typos: FAIL MBEDTLS_KEY_EXCHANGE_ECJPAKE MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED FAILED --- library/ssl_cli.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/library/ssl_cli.c b/library/ssl_cli.c index 483743dad..2d1dcf868 100644 --- a/library/ssl_cli.c +++ b/library/ssl_cli.c @@ -666,12 +666,6 @@ static int ssl_validate_ciphersuite( const mbedtls_ssl_ciphersuite_t * suite_inf return( 1 ); #endif -#if defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED) - if( suite_info->key_exchange == MBEDTLS_KEY_EXCHANGE_ECJPAKE && - mbedtls_ecjpake_check( &ssl->handshake->ecjpake_ctx ) != 0 ) - return( 1 ); -#endif - return( 0 ); }