diff options
| author | Matt Caswell <matt@openssl.org> | 2019-06-13 19:34:37 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-06-17 10:57:19 +0100 |
| commit | 65dc5c3cc10af7c6f24ecd922adb7b6d17a9fe65 (patch) | |
| tree | b4b969f236f90015b0d63ef80781e7bd49ed2f4b /ssl/statem | |
| parent | dbc6268f68e50b2e49d7c5b1157b4f6bcea5d6f9 (diff) | |
Fix no-ec with no-dh
Make sure that the combination of no-ec with no-dh builds successfully.
If neither ec or dh are available then TLSv1.3 is not possible.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9156)
Diffstat (limited to 'ssl/statem')
| -rw-r--r-- | ssl/statem/extensions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c index 9023e47599..eacc7215b5 100644 --- a/ssl/statem/extensions.c +++ b/ssl/statem/extensions.c @@ -1267,6 +1267,7 @@ static int final_sig_algs(SSL *s, unsigned int context, int sent) static int final_key_share(SSL *s, unsigned int context, int sent) { +#if !defined(OPENSSL_NO_TLS1_3) if (!SSL_IS_TLS13(s)) return 1; @@ -1424,7 +1425,7 @@ static int final_key_share(SSL *s, unsigned int context, int sent) return 0; } } - +#endif /* !defined(OPENSSL_NO_TLS1_3) */ return 1; } |