Add an "SSL" infix to MBEDTLS_EARLY_KEY_COMPUTATION
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
diff --git a/configs/baremetal.h b/configs/baremetal.h
index 038b060..3c59bb9 100644
--- a/configs/baremetal.h
+++ b/configs/baremetal.h
@@ -166,7 +166,7 @@
#define MBEDTLS_DELAYED_SERVER_CERT_VERIFICATION
#define MBEDTLS_SSL_FREE_SERVER_CERTIFICATE
#define MBEDTLS_SSL_IMMEDIATE_TRANSMISSION
-#define MBEDTLS_EARLY_KEY_COMPUTATION
+#define MBEDTLS_SSL_EARLY_KEY_COMPUTATION
#if defined(MBEDTLS_USER_CONFIG_FILE)
#include MBEDTLS_USER_CONFIG_FILE
diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 97dcc02..2a2f19c 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -915,8 +915,8 @@
#endif
-#if defined(MBEDTLS_EARLY_KEY_COMPUTATION) && !defined(MBEDTLS_USE_TINYCRYPT)
-#error "MBEDTLS_EARLY_KEY_COMPUTATION can only be used with MBEDTLS_USE_TINYCRYPT"
+#if defined(MBEDTLS_SSL_EARLY_KEY_COMPUTATION) && !defined(MBEDTLS_USE_TINYCRYPT)
+#error "MBEDTLS_SSL_EARLY_KEY_COMPUTATION can only be used with MBEDTLS_USE_TINYCRYPT"
#endif
/*
diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 0fca50a..d9b6922 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -1625,14 +1625,14 @@
//#define MBEDTLS_SSL_IMMEDIATE_TRANSMISSION
/**
- * \def MBEDTLS_EARLY_KEY_COMPUTATION
+ * \def MBEDTLS_SSL_EARLY_KEY_COMPUTATION
*
* Create ephemeral Diffie-Hellman key pair after
* the ClientHello has been successfully transmitted.
*
* Requires:
*/
-//#define MBEDTLS_EARLY_KEY_COMPUTATION
+//#define MBEDTLS_SSL_EARLY_KEY_COMPUTATION
/**
* \def MBEDTLS_SSL_HW_RECORD_ACCEL
diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h
index bd2169e..5d8f6fd 100644
--- a/include/mbedtls/ssl_internal.h
+++ b/include/mbedtls/ssl_internal.h
@@ -573,10 +573,10 @@
#if defined(MBEDTLS_USE_TINYCRYPT)
uint8_t ecdh_privkey[NUM_ECC_BYTES];
-#if defined(MBEDTLS_EARLY_KEY_COMPUTATION)
+#if defined(MBEDTLS_SSL_EARLY_KEY_COMPUTATION)
uint8_t ecdhe_computed;
uint8_t ecdh_publickey[2*NUM_ECC_BYTES];
-#endif /* MBEDTLS_EARLY_KEY_COMPUTATION */
+#endif /* MBEDTLS_SSL_EARLY_KEY_COMPUTATION */
uint8_t ecdh_peerkey[2*NUM_ECC_BYTES];
#endif /* MBEDTLS_USE_TINYCRYPT */
diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index bde7d10..ba6a806 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -3667,7 +3667,7 @@
*p++ = 2 * NUM_ECC_BYTES + 1;
*p++ = 0x04; /* uncompressed point presentation */
-#if defined(MBEDTLS_EARLY_KEY_COMPUTATION)
+#if defined(MBEDTLS_SSL_EARLY_KEY_COMPUTATION)
mbedtls_platform_memcpy( p, ssl->handshake->ecdh_publickey,
2 * NUM_ECC_BYTES );
#else
@@ -3676,7 +3676,7 @@
return( MBEDTLS_ERR_PLATFORM_FAULT_DETECTED );
if( ret != UECC_SUCCESS )
return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );
-#endif /* MBEDTLS_EARLY_KEY_COMPUTATION && MBEDTLS_USE_TINYCRYPT */
+#endif /* MBEDTLS_SSL_EARLY_KEY_COMPUTATION && MBEDTLS_USE_TINYCRYPT */
p += 2 * NUM_ECC_BYTES;
}
else
@@ -4282,7 +4282,7 @@
* ServerHelloDone
*/
case MBEDTLS_SSL_SERVER_HELLO:
-#if defined(MBEDTLS_EARLY_KEY_COMPUTATION) && defined(MBEDTLS_USE_TINYCRYPT)
+#if defined(MBEDTLS_SSL_EARLY_KEY_COMPUTATION) && defined(MBEDTLS_USE_TINYCRYPT)
/* Make sure that the ECDHE pre-computation is only done once */
if( ssl->handshake->ecdhe_computed == 0 )
{
@@ -4293,7 +4293,7 @@
return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );
ssl->handshake->ecdhe_computed = 1;
}
-#endif /* MBEDTLS_EARLY_KEY_COMPUTATION && MBEDTLS_USE_TINYCRYPT */
+#endif /* MBEDTLS_SSL_EARLY_KEY_COMPUTATION && MBEDTLS_USE_TINYCRYPT */
ret = ssl_parse_server_hello( ssl );
break;
diff --git a/library/version_features.c b/library/version_features.c
index 11045f8..0ada3c6 100644
--- a/library/version_features.c
+++ b/library/version_features.c
@@ -498,9 +498,9 @@
#if defined(MBEDTLS_SSL_IMMEDIATE_TRANSMISSION)
"MBEDTLS_SSL_IMMEDIATE_TRANSMISSION",
#endif /* MBEDTLS_SSL_IMMEDIATE_TRANSMISSION */
-#if defined(MBEDTLS_EARLY_KEY_COMPUTATION)
- "MBEDTLS_EARLY_KEY_COMPUTATION",
-#endif /* MBEDTLS_EARLY_KEY_COMPUTATION */
+#if defined(MBEDTLS_SSL_EARLY_KEY_COMPUTATION)
+ "MBEDTLS_SSL_EARLY_KEY_COMPUTATION",
+#endif /* MBEDTLS_SSL_EARLY_KEY_COMPUTATION */
#if defined(MBEDTLS_SSL_HW_RECORD_ACCEL)
"MBEDTLS_SSL_HW_RECORD_ACCEL",
#endif /* MBEDTLS_SSL_HW_RECORD_ACCEL */
diff --git a/programs/ssl/query_config.c b/programs/ssl/query_config.c
index 6f4e67f..1f8ae21 100644
--- a/programs/ssl/query_config.c
+++ b/programs/ssl/query_config.c
@@ -1370,13 +1370,13 @@
}
#endif /* MBEDTLS_SSL_IMMEDIATE_TRANSMISSION */
-#if defined(MBEDTLS_EARLY_KEY_COMPUTATION)
- if( strcmp( "MBEDTLS_EARLY_KEY_COMPUTATION", config ) == 0 )
+#if defined(MBEDTLS_SSL_EARLY_KEY_COMPUTATION)
+ if( strcmp( "MBEDTLS_SSL_EARLY_KEY_COMPUTATION", config ) == 0 )
{
- MACRO_EXPANSION_TO_STR( MBEDTLS_EARLY_KEY_COMPUTATION );
+ MACRO_EXPANSION_TO_STR( MBEDTLS_SSL_EARLY_KEY_COMPUTATION );
return( 0 );
}
-#endif /* MBEDTLS_EARLY_KEY_COMPUTATION */
+#endif /* MBEDTLS_SSL_EARLY_KEY_COMPUTATION */
#if defined(MBEDTLS_SSL_HW_RECORD_ACCEL)
if( strcmp( "MBEDTLS_SSL_HW_RECORD_ACCEL", config ) == 0 )
diff --git a/scripts/config.pl b/scripts/config.pl
index 1fc156c..d2af5a4 100755
--- a/scripts/config.pl
+++ b/scripts/config.pl
@@ -65,7 +65,7 @@
# MBEDTLS_DELAYED_SERVER_CERT_VERIFICATION
# MBEDTLS_SSL_FREE_SERVER_CERTIFICATE
# MBEDTLS_SSL_IMMEDIATE_TRANSMISSION
-# MBEDTLS_EARLY_KEY_COMPUTATION
+# MBEDTLS_SSL_EARLY_KEY_COMPUTATION
# and any symbol beginning _ALT
#
# The baremetal configuration excludes options that require a library or
@@ -157,7 +157,7 @@
MBEDTLS_DELAYED_SERVER_CERT_VERIFICATION
MBEDTLS_SSL_FREE_SERVER_CERTIFICATE
MBEDTLS_SSL_IMMEDIATE_TRANSMISSION
-MBEDTLS_EARLY_KEY_COMPUTATION
+MBEDTLS_SSL_EARLY_KEY_COMPUTATION
_ALT\s*$
);