diff options
author | Dirk Feytons <dirk.feytons@gmail.com> | 2016-09-22 16:17:45 +0200 |
---|---|---|
committer | Dirk Feytons <dirk.feytons@gmail.com> | 2016-09-22 16:17:45 +0200 |
commit | f15a7e39a1f7d41716ca5f07faef74f55147d2cf (patch) | |
tree | bb8f7f44fb969121d273dc3bebe5b338887f8163 | |
parent | 581215a519c66db7255ea360ed25bb00033ccd52 (diff) |
Fix build with no-nextprotoneg
Add a missing ifdef. Same change is already present in master.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1100)
-rw-r--r-- | ssl/t1_ext.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c index 724ddf76ac..79ed946a51 100644 --- a/ssl/t1_ext.c +++ b/ssl/t1_ext.c @@ -275,7 +275,9 @@ int SSL_extension_supported(unsigned int ext_type) case TLSEXT_TYPE_ec_point_formats: case TLSEXT_TYPE_elliptic_curves: case TLSEXT_TYPE_heartbeat: +# ifndef OPENSSL_NO_NEXTPROTONEG case TLSEXT_TYPE_next_proto_neg: +# endif case TLSEXT_TYPE_padding: case TLSEXT_TYPE_renegotiate: case TLSEXT_TYPE_server_name: |