Changeset View
Changeset View
Standalone View
Standalone View
security/openssl-devel/files/patch-nextprotoneg
- This file was added.
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
Submitted upstream: | |||||
"Fix incomplete no-nextprotoneg option" | |||||
https://github.com/openssl/openssl/pull/757 | |||||
--- util/mk1mf.pl.orig 2016-02-15 18:08:07 UTC | |||||
+++ util/mk1mf.pl | |||||
@@ -308,6 +308,7 @@ $cflags.=" -DOPENSSL_NO_AUTOERRINIT" if | |||||
$cflags.=" -DOPENSSL_FIPS" if $fips; | |||||
$cflags.=" -DOPENSSL_NO_JPAKE" if $no_jpake; | |||||
$cflags.=" -DOPENSSL_NO_EC2M" if $no_ec2m; | |||||
+$cflags.=" -DOPENSSL_NO_NEXTPROTONEG" if $no_nextprotoneg; | |||||
$cflags.= " -DZLIB" if $zlib_opt; | |||||
$cflags.= " -DZLIB_SHARED" if $zlib_opt == 2; | |||||
$cflags.=" -DOPENSSL_PIC" if $shlib; | |||||
--- apps/s_client.c.orig 2016-02-15 18:08:07 UTC | |||||
+++ apps/s_client.c | |||||
@@ -1292,9 +1292,11 @@ int s_client_main(int argc, char **argv) | |||||
goto end; | |||||
} | |||||
break; | |||||
+#ifndef OPENSSL_NO_NEXTPROTONEG | |||||
case OPT_NEXTPROTONEG: | |||||
next_proto_neg_in = opt_arg(); | |||||
break; | |||||
+#endif | |||||
case OPT_ALPN: | |||||
alpn_in = opt_arg(); | |||||
break; | |||||
--- ssl/t1_ext.c.orig 2016-02-15 18:08:07 UTC | |||||
+++ ssl/t1_ext.c | |||||
@@ -272,7 +272,9 @@ int SSL_extension_supported(unsigned int | |||||
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: |