summaryrefslogtreecommitdiffstats
path: root/package/libs/openssl/patches/301-fix_no_nextprotoneg_build.patch
diff options
context:
space:
mode:
authorMagnus Kroken <mkroken@gmail.com>2016-09-26 17:21:52 +0200
committerJohn Crispin <john@phrozen.org>2016-09-27 17:50:22 +0200
commitb1f39d3d7ee7ba0714e45af64a935b01877a5175 (patch)
tree0ba98cf9341cac670180e2a0a127f4dc4d62437c /package/libs/openssl/patches/301-fix_no_nextprotoneg_build.patch
parent142ec7ada939313cc890f94df5fc6903f2660635 (diff)
downloadmaster-31e0f0ae-b1f39d3d7ee7ba0714e45af64a935b01877a5175.tar.gz
master-31e0f0ae-b1f39d3d7ee7ba0714e45af64a935b01877a5175.tar.bz2
master-31e0f0ae-b1f39d3d7ee7ba0714e45af64a935b01877a5175.zip
openssl: update to 1.0.2j
A bug fix which included a CRL sanity check was added to OpenSSL 1.1.0 but was omitted from OpenSSL 1.0.2i. As a result any attempt to use CRLs in OpenSSL 1.0.2i will crash with a null pointer exception. Patches applied upstream: * 301-fix_no_nextprotoneg_build.patch * 302-Fix_typo_introduced_by_a03f81f4.patch Security advisory: https://www.openssl.org/news/secadv/20160926.txt Signed-off-by: Magnus Kroken <mkroken@gmail.com>
Diffstat (limited to 'package/libs/openssl/patches/301-fix_no_nextprotoneg_build.patch')
-rw-r--r--package/libs/openssl/patches/301-fix_no_nextprotoneg_build.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/package/libs/openssl/patches/301-fix_no_nextprotoneg_build.patch b/package/libs/openssl/patches/301-fix_no_nextprotoneg_build.patch
deleted file mode 100644
index 91465a33ea..0000000000
--- a/package/libs/openssl/patches/301-fix_no_nextprotoneg_build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f15a7e39a1f7d41716ca5f07faef74f55147d2cf Mon Sep 17 00:00:00 2001
-From: Dirk Feytons <dirk.feytons@gmail.com>
-Date: Thu, 22 Sep 2016 16:17:45 +0200
-Subject: [PATCH] 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)
----
- ssl/t1_ext.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/ssl/t1_ext.c
-+++ b/ssl/t1_ext.c
-@@ -275,7 +275,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: