commit 16529b21fabeadf0aaae621b6ac2e054ef6a13de
author Jaeden Amero <jaeden@patater.com> Mon Jun 03 08:27:16 2019 +0100
committer Jaeden Amero <jaeden.amero@arm.com> Thu Jun 20 16:34:24 2019 +0100
tree 4425f90f494942a07f58a74274d4dd9460aff2ae
parent 73a36ff512079cdc32483067cba95bfa505540b1

ssl_tls: Enable Suite B with subset of ECP curves

Make sure the code compiles even if some curves are not defined.

Fixes #1591

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 556a9b3..9b5456e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,8 @@
    * Fix Visual Studio Release x64 build configuration by inheriting
      PlatformToolset from the project configuration. Fixes #1430 reported by
      irwir.
+   * Enable Suite B with subset of ECP curves. Make sure the code compiles even
+     if some curves are not defined. Fixes #1591 reported by dbedev.
 
 Changes
    * Return from various debugging routines immediately if the

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 38690fa..424b071 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -9043,8 +9043,12 @@
 
 #if defined(MBEDTLS_ECP_C)
 static mbedtls_ecp_group_id ssl_preset_suiteb_curves[] = {
+#if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
     MBEDTLS_ECP_DP_SECP256R1,
+#endif
+#if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
     MBEDTLS_ECP_DP_SECP384R1,
+#endif
     MBEDTLS_ECP_DP_NONE
 };
 #endif