diff options
| author | Matt Caswell <matt@openssl.org> | 2021-01-13 15:50:36 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-02-05 15:20:36 +0000 |
| commit | ddf8f1ce634b9a3bd30603d9e0eaec1990a0d586 (patch) | |
| tree | 7c550e9e93899a3e73d6b88ad407623375a9d0e5 /ssl/statem/extensions.c | |
| parent | 5b64ce89b0859956387cda1d56718d2a5f09d928 (diff) | |
Ensure default supported groups works even with no-ec and no-dh
The default supported groups code was disabled in the event of a build
with no-ec and no-dh. However now that providers can add there own
groups (which might not fit into either of these categories), this is
no longer appropriate.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13916)
Diffstat (limited to 'ssl/statem/extensions.c')
| -rw-r--r-- | ssl/statem/extensions.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c index 1a3435a949..6bd7a69364 100644 --- a/ssl/statem/extensions.c +++ b/ssl/statem/extensions.c @@ -163,7 +163,6 @@ static const EXTENSION_DEFINITION ext_defs[] = { #else INVALID_EXTENSION, #endif -#if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH) { /* * "supported_groups" is spread across several specifications. @@ -197,9 +196,6 @@ static const EXTENSION_DEFINITION ext_defs[] = { tls_construct_stoc_supported_groups, tls_construct_ctos_supported_groups, NULL }, -#else - INVALID_EXTENSION, -#endif { TLSEXT_TYPE_session_ticket, SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO |