diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-09-24 19:50:27 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-09-24 19:53:00 +0200 |
| commit | ea288126dbcf11ecf990b858e1c563b24b198327 (patch) | |
| tree | d7dfdf194102763041ac79471d1de47c5889f996 /package/libs/openssl/patches/301-fix_no_nextprotoneg_build.patch | |
| parent | 524d4110f9a21bb570390303503c61a79435a984 (diff) | |
| download | master-31e0f0ae-ea288126dbcf11ecf990b858e1c563b24b198327.tar.gz master-31e0f0ae-ea288126dbcf11ecf990b858e1c563b24b198327.tar.bz2 master-31e0f0ae-ea288126dbcf11ecf990b858e1c563b24b198327.zip | |
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>
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.patch | 14 |
1 files changed, 14 insertions, 0 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 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 |