summaryrefslogtreecommitdiffstats
path: root/package/libs/openssl/patches/302-fix_no_cmac_build.patch
diff options
context:
space:
mode:
authorMagnus Kroken <mkroken@gmail.com>2016-09-24 11:36:49 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2016-09-24 13:28:59 +0200
commit6926325829a2f58059ca8e614c892062fbbae393 (patch)
tree42cb599d97a50e447d611c847295288f90f54251 /package/libs/openssl/patches/302-fix_no_cmac_build.patch
parentc15d70c6d6a00529a119a41b97953eac9c41a8fc (diff)
downloadmaster-31e0f0ae-6926325829a2f58059ca8e614c892062fbbae393.tar.gz
master-31e0f0ae-6926325829a2f58059ca8e614c892062fbbae393.tar.bz2
master-31e0f0ae-6926325829a2f58059ca8e614c892062fbbae393.zip
openssl: update to 1.0.2i
Drop 302-fix_no_cmac_build.patch, it has been applied upstream. Security fixes: * (Severity: High) OCSP Status Request extension unbounded memory growth (CVE-2016-6304) * (Severity: Moderate) SSL_peek() hang on empty record (CVE-2016-6305) * 10 Low severity issues Security advisory: https://www.openssl.org/news/secadv/20160922.txt Changelog: https://www.openssl.org/news/cl102.txt Signed-off-by: Magnus Kroken <mkroken@gmail.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/libs/openssl/patches/302-fix_no_cmac_build.patch')
-rw-r--r--package/libs/openssl/patches/302-fix_no_cmac_build.patch24
1 files changed, 0 insertions, 24 deletions
diff --git a/package/libs/openssl/patches/302-fix_no_cmac_build.patch b/package/libs/openssl/patches/302-fix_no_cmac_build.patch
deleted file mode 100644
index 1b94f24508..0000000000
--- a/package/libs/openssl/patches/302-fix_no_cmac_build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/crypto/asn1/ameth_lib.c
-+++ b/crypto/asn1/ameth_lib.c
-@@ -93,7 +93,9 @@ static const EVP_PKEY_ASN1_METHOD *stand
- &eckey_asn1_meth,
- #endif
- &hmac_asn1_meth,
-+#ifndef OPENSSL_NO_CMAC
- &cmac_asn1_meth,
-+#endif
- #ifndef OPENSSL_NO_DH
- &dhx_asn1_meth
- #endif
---- a/crypto/evp/pmeth_lib.c
-+++ b/crypto/evp/pmeth_lib.c
-@@ -91,7 +91,9 @@ static const EVP_PKEY_METHOD *standard_m
- &ec_pkey_meth,
- #endif
- &hmac_pkey_meth,
-+#ifndef OPENSSL_NO_CMAC
- &cmac_pkey_meth,
-+#endif
- #ifndef OPENSSL_NO_DH
- &dhx_pkey_meth
- #endif