diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-11 11:41:19 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-11 14:22:43 +0100 |
| commit | 1595ca029cbc1f76971843d89ed06b6ffbf17c84 (patch) | |
| tree | 73fc2ea13d48087fdffaa67d01f46a1809bb73c2 /ssl | |
| parent | 2d897ae4d8af83d7920ac4c52d0cab32739d671b (diff) | |
Fix the no-nextprotoneg option
Misc fixes to get no-nextprotoneg config option working again.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl')
| -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 e9933976cf..3bbe1fd826 100644 --- a/ssl/t1_ext.c +++ b/ssl/t1_ext.c @@ -293,7 +293,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: |