diff options
| author | jkim <jkim@FreeBSD.org> | 2016-09-26 14:30:19 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2016-09-26 14:30:19 +0000 |
| commit | 877a6c9c2b93b64ddbd43ee096a56151231d08e6 (patch) | |
| tree | 26225434007e66d2c35ab5c8e9154dff2758cebe /crypto/openssl/ssl/t1_ext.c | |
| parent | 9d924fb59145654175677c1c455812f4a4402915 (diff) | |
| download | FreeBSD-src-877a6c9c2b93b64ddbd43ee096a56151231d08e6.zip FreeBSD-src-877a6c9c2b93b64ddbd43ee096a56151231d08e6.tar.gz | |
MFC: r306342
Merge OpenSSL 1.0.2j.
Diffstat (limited to 'crypto/openssl/ssl/t1_ext.c')
| -rw-r--r-- | crypto/openssl/ssl/t1_ext.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/t1_ext.c b/crypto/openssl/ssl/t1_ext.c index 724ddf7..79ed946 100644 --- a/crypto/openssl/ssl/t1_ext.c +++ b/crypto/openssl/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: |
