From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 24 Sep 2016 17:50:27 +0000 (+0200)
Subject: openssl: backport build fix when hardware support is used
X-Git-Tag: v17.01.0-rc1~1388
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ea288126dbcf11ecf990b858e1c563b24b198327;p=oweals%2Fopenwrt.git

openssl: backport build fix when hardware support is used

This fix added to the openssl 1.0.2 branch.
In addition add the header for the existing backport.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/package/libs/openssl/patches/301-fix_no_nextprotoneg_build.patch b/package/libs/openssl/patches/301-fix_no_nextprotoneg_build.patch
index 04b76c749c..91465a33ea 100644
--- a/package/libs/openssl/patches/301-fix_no_nextprotoneg_build.patch
+++ b/package/libs/openssl/patches/301-fix_no_nextprotoneg_build.patch
@@ -1,3 +1,17 @@
+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
diff --git a/package/libs/openssl/patches/302-Fix_typo_introduced_by_a03f81f4.patch b/package/libs/openssl/patches/302-Fix_typo_introduced_by_a03f81f4.patch
new file mode 100644
index 0000000000..8b14365fe1
--- /dev/null
+++ b/package/libs/openssl/patches/302-Fix_typo_introduced_by_a03f81f4.patch
@@ -0,0 +1,21 @@
+From 581215a519c66db7255ea360ed25bb00033ccd52 Mon Sep 17 00:00:00 2001
+From: Rich Salz <rsalz@openssl.org>
+Date: Thu, 22 Sep 2016 08:47:45 -0400
+Subject: [PATCH] Fix typo introduced by a03f81f4
+
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+---
+ crypto/engine/eng_cryptodev.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/crypto/engine/eng_cryptodev.c
++++ b/crypto/engine/eng_cryptodev.c
+@@ -939,7 +939,7 @@ static int cryptodev_digest_copy(EVP_MD_
+     if (fstate->mac_len != 0) {
+         if (fstate->mac_data != NULL) {
+             dstate->mac_data = OPENSSL_malloc(fstate->mac_len);
+-            if (dstate->ac_data == NULL) {
++            if (dstate->mac_data == NULL) {
+                 printf("cryptodev_digest_init: malloc failed\n");
+                 return 0;
+             }