blob: ce06868ad8f371ef978f1eaf08220bc2637bf5a6 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
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:
|
