diff options
| -rw-r--r-- | package/openssl/Makefile | 6 | ||||
| -rw-r--r-- | package/openssl/patches/patch-crypto_opensslconf_h | 50 |
2 files changed, 18 insertions, 38 deletions
diff --git a/package/openssl/Makefile b/package/openssl/Makefile index f0fa4e9d8..d632a091b 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssl -PKG_VERSION:= 1.0.1h -PKG_RELEASE:= 2 -PKG_MD5SUM:= 8d6d684a9430d5cc98a62a5d8fbda8cf +PKG_VERSION:= 1.0.1i +PKG_RELEASE:= 1 +PKG_MD5SUM:= c8dc151a671b9b92ff3e4c118b174972 PKG_DESCR:= secure socket layer libraries PKG_SECTION:= libs/crypto PKG_DEPENDS:= zlib diff --git a/package/openssl/patches/patch-crypto_opensslconf_h b/package/openssl/patches/patch-crypto_opensslconf_h index 77701e9b4..4961408c6 100644 --- a/package/openssl/patches/patch-crypto_opensslconf_h +++ b/package/openssl/patches/patch-crypto_opensslconf_h @@ -1,6 +1,6 @@ ---- openssl-1.0.1e.orig/crypto/opensslconf.h 2013-02-11 16:26:04.000000000 +0100 -+++ openssl-1.0.1e/crypto/opensslconf.h 2013-08-17 16:07:12.626613032 +0200 -@@ -5,12 +5,39 @@ +--- openssl-1.0.1i.orig/crypto/opensslconf.h 2014-08-06 23:18:45.000000000 +0200 ++++ openssl-1.0.1i/crypto/opensslconf.h 2014-08-07 10:03:55.000000000 +0200 +@@ -5,12 +5,27 @@ #ifndef OPENSSL_DOING_MAKEDEPEND @@ -13,34 +13,22 @@ +#ifndef OPENSSL_NO_CAST +# define OPENSSL_NO_CAST +#endif -+#ifndef OPENSSL_NO_EC -+# define OPENSSL_NO_EC -+#endif #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 # define OPENSSL_NO_EC_NISTP_64_GCC_128 #endif -+#ifndef OPENSSL_NO_ECDH -+# define OPENSSL_NO_ECDH -+#endif -+#ifndef OPENSSL_NO_ECDSA -+# define OPENSSL_NO_ECDSA -+#endif +#ifndef OPENSSL_NO_ENGINES +# define OPENSSL_NO_ENGINES +#endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif -+#ifndef OPENSSL_NO_GOST -+# define OPENSSL_NO_GOST -+#endif +#ifndef OPENSSL_NO_IDEA +# define OPENSSL_NO_IDEA +#endif #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE #endif -@@ -20,23 +47,38 @@ +@@ -20,15 +35,27 @@ #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif @@ -68,11 +56,15 @@ #ifndef OPENSSL_NO_STORE # define OPENSSL_NO_STORE #endif +@@ -38,8 +65,14 @@ #endif /* OPENSSL_DOING_MAKEDEPEND */ -#ifndef OPENSSL_NO_DYNAMIC_ENGINE -# define OPENSSL_NO_DYNAMIC_ENGINE ++#ifndef OPENSSL_THREADS ++# define OPENSSL_THREADS ++#endif +#ifndef OPENSSL_NO_ERR +# define OPENSSL_NO_ERR +#endif @@ -81,7 +73,7 @@ #endif /* The OPENSSL_NO_* macros are also defined as NO_* if the application -@@ -44,12 +86,39 @@ +@@ -47,12 +80,27 @@ who haven't had the time to do the appropriate changes in their applications. */ #ifdef OPENSSL_ALGORITHM_DEFINES @@ -94,34 +86,22 @@ +# if defined(OPENSSL_NO_CAST) && !defined(NO_CAST) +# define NO_CAST +# endif -+# if defined(OPENSSL_NO_EC) && !defined(NO_EC) -+# define NO_EC -+# endif # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) # define NO_EC_NISTP_64_GCC_128 # endif -+# if defined(OPENSSL_NO_ECDH) && !defined(NO_ECDH) -+# define NO_ECDH -+# endif -+# if defined(OPENSSL_NO_ECDSA) && !defined(NO_ECDSA) -+# define NO_ECDSA -+# endif +# if defined(OPENSSL_NO_ENGINES) && !defined(NO_ENGINES) +# define NO_ENGINES +# endif # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # define NO_GMP # endif -+# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) -+# define NO_GOST -+# endif +# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA) +# define NO_IDEA +# endif # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) # define NO_JPAKE # endif -@@ -59,15 +128,27 @@ +@@ -62,15 +110,27 @@ # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif @@ -149,7 +129,7 @@ # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) # define NO_STORE # endif -@@ -80,8 +161,8 @@ +@@ -86,8 +146,8 @@ #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) @@ -160,7 +140,7 @@ #endif #endif -@@ -112,14 +193,14 @@ +@@ -118,14 +178,14 @@ * - Intel P6 because partial register stalls are very expensive; * - elder Alpha because it lacks byte load/store instructions; */ @@ -177,7 +157,7 @@ #endif #endif -@@ -127,13 +208,13 @@ +@@ -133,13 +193,13 @@ /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #ifndef DES_LONG @@ -193,7 +173,7 @@ /* Should we define BN_DIV2W here? */ -@@ -152,7 +233,7 @@ +@@ -158,7 +218,7 @@ #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) #define CONFIG_HEADER_BF_LOCL_H @@ -202,7 +182,7 @@ #endif /* HEADER_BF_LOCL_H */ #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) -@@ -182,7 +263,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND D +@@ -188,7 +248,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND D /* Unroll the inner loop, this sometimes helps, sometimes hinders. * Very mucy CPU dependant */ #ifndef DES_UNROLL |