ssl_tls: Enable Suite B with subset of ECP curves

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

Fixes #1591
This commit is contained in:
Jaeden Amero 2019-06-03 08:27:16 +01:00 committed by Jaeden Amero
parent 73a36ff512
commit 16529b21fa
2 changed files with 6 additions and 0 deletions

View File

@ -51,6 +51,8 @@ Bugfix
* Fix Visual Studio Release x64 build configuration by inheriting * Fix Visual Studio Release x64 build configuration by inheriting
PlatformToolset from the project configuration. Fixes #1430 reported by PlatformToolset from the project configuration. Fixes #1430 reported by
irwir. 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 Changes
* Return from various debugging routines immediately if the * Return from various debugging routines immediately if the

View File

@ -9043,8 +9043,12 @@ static int ssl_preset_suiteb_hashes[] = {
#if defined(MBEDTLS_ECP_C) #if defined(MBEDTLS_ECP_C)
static mbedtls_ecp_group_id ssl_preset_suiteb_curves[] = { static mbedtls_ecp_group_id ssl_preset_suiteb_curves[] = {
#if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
MBEDTLS_ECP_DP_SECP256R1, MBEDTLS_ECP_DP_SECP256R1,
#endif
#if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
MBEDTLS_ECP_DP_SECP384R1, MBEDTLS_ECP_DP_SECP384R1,
#endif
MBEDTLS_ECP_DP_NONE MBEDTLS_ECP_DP_NONE
}; };
#endif #endif