diff options
| author | Benjamin Kaduk <bkaduk@akamai.com> | 2017-10-11 07:55:30 -0500 |
|---|---|---|
| committer | Benjamin Kaduk <bkaduk@akamai.com> | 2017-10-11 08:25:40 -0500 |
| commit | f9df0a7775f483c175cda5832360cccd1db6943a (patch) | |
| tree | 7c8ffca07257f6b02c9428b9d6c873a62708971e /ssl | |
| parent | f49452c297438ec349a76dfa38fa26a780084f96 (diff) | |
| download | openssl-f9df0a7775f483c175cda5832360cccd1db6943a.tar.gz | |
Move supportedgroup ext-block fields out of NO_EC
Now that we are moving to support named FFDH groups, these fields are not
ec-specific, so we need them to always be available.
This fixes the no-ec --strict-warnings build, since gcc
5.4.0-6ubuntu1~16.04.4 appears to always try to compile the static inline
functions from ssl_locl.h, even when they are not used in the current
compilation unit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4518)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_locl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index c73035df70..78511c287a 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -541,9 +541,9 @@ struct ssl_session_st { # ifndef OPENSSL_NO_EC size_t ecpointformats_len; unsigned char *ecpointformats; /* peer's list */ +# endif /* OPENSSL_NO_EC */ size_t supportedgroups_len; uint16_t *supportedgroups; /* peer's list */ -# endif /* OPENSSL_NO_EC */ /* RFC4507 info */ unsigned char *tick; /* Session ticket */ size_t ticklen; /* Session ticket length */ @@ -1202,10 +1202,10 @@ struct ssl_st { size_t ecpointformats_len; /* our list */ unsigned char *ecpointformats; +# endif /* OPENSSL_NO_EC */ size_t supportedgroups_len; /* our list */ uint16_t *supportedgroups; -# endif /* OPENSSL_NO_EC */ /* TLS Session Ticket extension override */ TLS_SESSION_TICKET_EXT *session_ticket; /* TLS Session Ticket extension callback */ |