From 2e7b686f71dd25a8fcac58c648c1d2e6ae57113c Mon Sep 17 00:00:00 2001 From: Ron Eldor Date: Wed, 11 Jul 2018 13:37:38 +0300 Subject: [PATCH] Remove reference to ECJPAKE Remove reference to `MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED` as branch `mbedtls-2.1` doesn't have `ECJPAKE`. This definition was accidently inserted in a backport. --- library/ssl_cli.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/library/ssl_cli.c b/library/ssl_cli.c index 4701b13e1..14b7a481d 100644 --- a/library/ssl_cli.c +++ b/library/ssl_cli.c @@ -678,8 +678,7 @@ static int ssl_write_client_hello( mbedtls_ssl_context *ssl ) unsigned char offer_compress; const int *ciphersuites; const mbedtls_ssl_ciphersuite_t *ciphersuite_info; -#if defined(MBEDTLS_ECDH_C) || defined(MBEDTLS_ECDSA_C) || \ - defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED) +#if defined(MBEDTLS_ECDH_C) || defined(MBEDTLS_ECDSA_C) int uses_ec = 0; #endif @@ -833,8 +832,7 @@ static int ssl_write_client_hello( mbedtls_ssl_context *ssl ) MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, add ciphersuite: %2d", ciphersuites[i] ) ); -#if defined(MBEDTLS_ECDH_C) || defined(MBEDTLS_ECDSA_C) || \ - defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED) +#if defined(MBEDTLS_ECDH_C) || defined(MBEDTLS_ECDSA_C) uses_ec |= mbedtls_ssl_ciphersuite_uses_ec( ciphersuite_info ); #endif