diff options
| author | Steven Barth <steven@midlink.org> | 2015-02-09 15:28:09 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2015-02-09 15:28:09 +0000 |
| commit | 0a6b6a41beaf1c265321b78696236cb760bef478 (patch) | |
| tree | 142f32a663672aad198b6e6732f402598b930087 | |
| parent | 315c34efde7eb3147ed455394cdfdc876ecce1b7 (diff) | |
| download | upstream-0a6b6a41beaf1c265321b78696236cb760bef478.tar.gz upstream-0a6b6a41beaf1c265321b78696236cb760bef478.tar.bz2 upstream-0a6b6a41beaf1c265321b78696236cb760bef478.zip | |
openssl: fix upstream regression for non-ec builds
Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@44365 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/libs/openssl/Makefile | 2 | ||||
| -rw-r--r-- | package/libs/openssl/patches/220-fix-no-ec-build.patch | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 860395ed18..b5f5ad73f2 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl PKG_VERSION:=1.0.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 diff --git a/package/libs/openssl/patches/220-fix-no-ec-build.patch b/package/libs/openssl/patches/220-fix-no-ec-build.patch new file mode 100644 index 0000000000..44ec50eae4 --- /dev/null +++ b/package/libs/openssl/patches/220-fix-no-ec-build.patch @@ -0,0 +1,14 @@ +--- a/ssl/t1_lib.c ++++ b/ssl/t1_lib.c +@@ -113,9 +113,11 @@ + #include <openssl/objects.h> + #include <openssl/evp.h> + #include <openssl/hmac.h> ++#ifndef OPENSSL_NO_EC + #ifdef OPENSSL_NO_EC2M + # include <openssl/ec.h> + #endif ++#endif + #include <openssl/ocsp.h> + #include <openssl/rand.h> + #include "ssl_locl.h" |