From b4dd33016da33fc9497c5ca74e3f0da5aa08f6f7 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 3 Nov 2008 21:26:27 +0000 Subject: [PATCH] Update openssl to 0.9.8i (#4060) SVN-Revision: 13109 --- package/openssl/Makefile | 4 +- package/openssl/patches/150-no_engines.patch | 14 +- package/openssl/patches/200-ocf.patch | 120 +++++++++--------- .../openssl/patches/300-etrax_support.patch | 2 +- 4 files changed, 71 insertions(+), 69 deletions(-) diff --git a/package/openssl/Makefile b/package/openssl/Makefile index dce7550538..ba1e38e9ea 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl -PKG_VERSION:=0.9.8h +PKG_VERSION:=0.9.8i PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=http://www.openssl.org/source/ \ ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \ ftp://ftp.webmonster.de/pub/openssl/source/ \ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ -PKG_MD5SUM:=7d3d41dafc76cf2fcb5559963b5783b3 +PKG_MD5SUM:=561e00f18821c74b2b86c8c7786f9d8b include $(INCLUDE_DIR)/package.mk diff --git a/package/openssl/patches/150-no_engines.patch b/package/openssl/patches/150-no_engines.patch index b4e4999e43..127ce98a2c 100644 --- a/package/openssl/patches/150-no_engines.patch +++ b/package/openssl/patches/150-no_engines.patch @@ -1,7 +1,7 @@ -diff -ur openssl-0.9.8h.orig/Configure openssl-0.9.8h/Configure ---- openssl-0.9.8h.orig/Configure 2008-05-31 17:31:04.000000000 +0200 -+++ openssl-0.9.8h/Configure 2008-05-31 17:30:47.000000000 +0200 -@@ -1712,6 +1712,11 @@ +diff -ur openssl-0.9.8i.orig/Configure openssl-0.9.8i/Configure +--- openssl-0.9.8i.orig/Configure 2008-05-31 17:31:04.000000000 +0200 ++++ openssl-0.9.8i/Configure 2008-05-31 17:30:47.000000000 +0200 +@@ -1714,6 +1714,11 @@ close(OUT); } @@ -13,9 +13,9 @@ diff -ur openssl-0.9.8h.orig/Configure openssl-0.9.8h/Configure print < #include -diff -Nur openssl-0.9.8h/apps/progs.h openssl-0.9.8h-ocf/apps/progs.h ---- openssl-0.9.8h/apps/progs.h 2008-04-04 01:03:41.000000000 +0200 -+++ openssl-0.9.8h-ocf/apps/progs.h 2008-07-12 04:18:53.000000000 +0200 +diff -Naur openssl-0.9.8i.orig/apps/progs.h openssl-0.9.8i/apps/progs.h +--- openssl-0.9.8i.orig/apps/progs.h 2008-10-01 04:16:02.000000000 +0200 ++++ openssl-0.9.8i/apps/progs.h 2008-10-01 04:16:12.000000000 +0200 @@ -129,7 +129,9 @@ #ifndef OPENSSL_NO_ENGINE {FUNC_TYPE_GENERAL,"engine",engine_main}, @@ -143,9 +143,9 @@ diff -Nur openssl-0.9.8h/apps/progs.h openssl-0.9.8h-ocf/apps/progs.h {FUNC_TYPE_GENERAL,"prime",prime_main}, #ifndef OPENSSL_NO_MD2 {FUNC_TYPE_MD,"md2",dgst_main}, -diff -Nur openssl-0.9.8h/apps/speed.c openssl-0.9.8h-ocf/apps/speed.c ---- openssl-0.9.8h/apps/speed.c 2007-11-15 14:33:47.000000000 +0100 -+++ openssl-0.9.8h-ocf/apps/speed.c 2008-07-12 04:18:53.000000000 +0200 +diff -Naur openssl-0.9.8i.orig/apps/speed.c openssl-0.9.8i/apps/speed.c +--- openssl-0.9.8i.orig/apps/speed.c 2008-10-01 04:16:02.000000000 +0200 ++++ openssl-0.9.8i/apps/speed.c 2008-10-01 04:16:12.000000000 +0200 @@ -292,7 +292,7 @@ "evp","sha256","sha512", "aes-128 ige","aes-192 ige","aes-256 ige"}; @@ -519,9 +519,9 @@ diff -Nur openssl-0.9.8h/apps/speed.c openssl-0.9.8h-ocf/apps/speed.c d=atof(sstrsep(&p,sep)); if(n) dsa_results[k][1]=1/(1/dsa_results[k][1]+1/d); -diff -Nur openssl-0.9.8h/config openssl-0.9.8h-ocf/config ---- openssl-0.9.8h/config 2007-08-01 13:21:35.000000000 +0200 -+++ openssl-0.9.8h-ocf/config 2008-07-12 04:18:53.000000000 +0200 +diff -Naur openssl-0.9.8i.orig/config openssl-0.9.8i/config +--- openssl-0.9.8i.orig/config 2008-10-01 04:16:01.000000000 +0200 ++++ openssl-0.9.8i/config 2008-10-01 04:16:12.000000000 +0200 @@ -48,10 +48,10 @@ # First get uname entries that we use below @@ -577,9 +577,9 @@ diff -Nur openssl-0.9.8h/config openssl-0.9.8h-ocf/config mips2-sgi-irix) CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'` CPU=${CPU:-0} -diff -Nur openssl-0.9.8h/crypto/cryptlib.h openssl-0.9.8h-ocf/crypto/cryptlib.h ---- openssl-0.9.8h/crypto/cryptlib.h 2005-05-21 15:19:44.000000000 +0200 -+++ openssl-0.9.8h-ocf/crypto/cryptlib.h 2008-07-12 04:18:53.000000000 +0200 +diff -Naur openssl-0.9.8i.orig/crypto/cryptlib.h openssl-0.9.8i/crypto/cryptlib.h +--- openssl-0.9.8i.orig/crypto/cryptlib.h 2008-10-01 04:16:01.000000000 +0200 ++++ openssl-0.9.8i/crypto/cryptlib.h 2008-10-01 04:16:12.000000000 +0200 @@ -62,7 +62,7 @@ #include #include @@ -589,10 +589,10 @@ diff -Nur openssl-0.9.8h/crypto/cryptlib.h openssl-0.9.8h-ocf/crypto/cryptlib.h #ifdef OPENSSL_USE_APPLINK #define BIO_FLAGS_UPLINK 0x8000 -diff -Nur openssl-0.9.8h/crypto/engine/eng_all.c openssl-0.9.8h-ocf/crypto/engine/eng_all.c ---- openssl-0.9.8h/crypto/engine/eng_all.c 2007-01-04 23:55:25.000000000 +0100 -+++ openssl-0.9.8h-ocf/crypto/engine/eng_all.c 2008-07-12 04:18:53.000000000 +0200 -@@ -104,13 +104,13 @@ +diff -Naur openssl-0.9.8i.orig/crypto/engine/eng_all.c openssl-0.9.8i/crypto/engine/eng_all.c +--- openssl-0.9.8i.orig/crypto/engine/eng_all.c 2008-10-01 04:16:01.000000000 +0200 ++++ openssl-0.9.8i/crypto/engine/eng_all.c 2008-10-01 04:17:20.000000000 +0200 +@@ -104,7 +104,7 @@ #endif #endif #ifndef OPENSSL_NO_HW @@ -600,6 +600,8 @@ diff -Nur openssl-0.9.8h/crypto/engine/eng_all.c openssl-0.9.8h-ocf/crypto/engin +#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) ENGINE_load_cryptodev(); #endif + #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) +@@ -113,7 +113,7 @@ #endif } @@ -608,9 +610,9 @@ diff -Nur openssl-0.9.8h/crypto/engine/eng_all.c openssl-0.9.8h-ocf/crypto/engin void ENGINE_setup_bsd_cryptodev(void) { static int bsd_cryptodev_default_loaded = 0; if (!bsd_cryptodev_default_loaded) { -diff -Nur openssl-0.9.8h/crypto/engine/eng_cryptodev.c openssl-0.9.8h-ocf/crypto/engine/eng_cryptodev.c ---- openssl-0.9.8h/crypto/engine/eng_cryptodev.c 2004-06-15 13:45:42.000000000 +0200 -+++ openssl-0.9.8h-ocf/crypto/engine/eng_cryptodev.c 2008-07-12 04:18:53.000000000 +0200 +diff -Naur openssl-0.9.8i.orig/crypto/engine/eng_cryptodev.c openssl-0.9.8i/crypto/engine/eng_cryptodev.c +--- openssl-0.9.8i.orig/crypto/engine/eng_cryptodev.c 2008-10-01 04:16:01.000000000 +0200 ++++ openssl-0.9.8i/crypto/engine/eng_cryptodev.c 2008-10-01 04:16:12.000000000 +0200 @@ -68,6 +68,16 @@ struct dev_crypto_state { struct session_op d_sess; @@ -1108,9 +1110,9 @@ diff -Nur openssl-0.9.8h/crypto/engine/eng_cryptodev.c openssl-0.9.8h-ocf/crypto r = cryptodev_bn_mod_exp(r0, I, rsa->d, rsa->n, ctx, NULL); BN_CTX_free(ctx); return (r); -diff -Nur openssl-0.9.8h/crypto/engine/eng_table.c openssl-0.9.8h-ocf/crypto/engine/eng_table.c ---- openssl-0.9.8h/crypto/engine/eng_table.c 2008-04-28 23:45:43.000000000 +0200 -+++ openssl-0.9.8h-ocf/crypto/engine/eng_table.c 2008-07-12 04:18:53.000000000 +0200 +diff -Naur openssl-0.9.8i.orig/crypto/engine/eng_table.c openssl-0.9.8i/crypto/engine/eng_table.c +--- openssl-0.9.8i.orig/crypto/engine/eng_table.c 2008-10-01 04:16:01.000000000 +0200 ++++ openssl-0.9.8i/crypto/engine/eng_table.c 2008-10-01 04:16:12.000000000 +0200 @@ -186,6 +186,8 @@ { engine_unlocked_finish(e, 0); @@ -1120,10 +1122,10 @@ diff -Nur openssl-0.9.8h/crypto/engine/eng_table.c openssl-0.9.8h-ocf/crypto/eng } } static IMPLEMENT_LHASH_DOALL_ARG_FN(int_unregister_cb,ENGINE_PILE *,ENGINE *) -diff -Nur openssl-0.9.8h/crypto/engine/engine.h openssl-0.9.8h-ocf/crypto/engine/engine.h ---- openssl-0.9.8h/crypto/engine/engine.h 2005-11-06 18:48:59.000000000 +0100 -+++ openssl-0.9.8h-ocf/crypto/engine/engine.h 2008-07-12 04:18:53.000000000 +0200 -@@ -688,7 +688,7 @@ +diff -Naur openssl-0.9.8i.orig/crypto/engine/engine.h openssl-0.9.8i/crypto/engine/engine.h +--- openssl-0.9.8i.orig/crypto/engine/engine.h 2008-10-01 04:16:01.000000000 +0200 ++++ openssl-0.9.8i/crypto/engine/engine.h 2008-10-01 04:16:12.000000000 +0200 +@@ -703,7 +703,7 @@ * values. */ void *ENGINE_get_static_state(void); @@ -1132,9 +1134,9 @@ diff -Nur openssl-0.9.8h/crypto/engine/engine.h openssl-0.9.8h-ocf/crypto/engine void ENGINE_setup_bsd_cryptodev(void); #endif -diff -Nur openssl-0.9.8h/crypto/evp/c_all.c openssl-0.9.8h-ocf/crypto/evp/c_all.c ---- openssl-0.9.8h/crypto/evp/c_all.c 2004-08-29 18:36:04.000000000 +0200 -+++ openssl-0.9.8h-ocf/crypto/evp/c_all.c 2008-07-12 04:18:53.000000000 +0200 +diff -Naur openssl-0.9.8i.orig/crypto/evp/c_all.c openssl-0.9.8i/crypto/evp/c_all.c +--- openssl-0.9.8i.orig/crypto/evp/c_all.c 2008-10-01 04:16:01.000000000 +0200 ++++ openssl-0.9.8i/crypto/evp/c_all.c 2008-10-01 04:16:12.000000000 +0200 @@ -83,7 +83,7 @@ OpenSSL_add_all_ciphers(); OpenSSL_add_all_digests(); @@ -1144,9 +1146,9 @@ diff -Nur openssl-0.9.8h/crypto/evp/c_all.c openssl-0.9.8h-ocf/crypto/evp/c_all. ENGINE_setup_bsd_cryptodev(); # endif #endif -diff -Nur openssl-0.9.8h/crypto/evp/c_alld.c openssl-0.9.8h-ocf/crypto/evp/c_alld.c ---- openssl-0.9.8h/crypto/evp/c_alld.c 2005-04-30 23:51:40.000000000 +0200 -+++ openssl-0.9.8h-ocf/crypto/evp/c_alld.c 2008-07-12 04:18:53.000000000 +0200 +diff -Naur openssl-0.9.8i.orig/crypto/evp/c_alld.c openssl-0.9.8i/crypto/evp/c_alld.c +--- openssl-0.9.8i.orig/crypto/evp/c_alld.c 2008-10-01 04:16:01.000000000 +0200 ++++ openssl-0.9.8i/crypto/evp/c_alld.c 2008-10-01 04:16:12.000000000 +0200 @@ -81,7 +81,7 @@ EVP_add_digest(EVP_dss()); #endif @@ -1156,10 +1158,10 @@ diff -Nur openssl-0.9.8h/crypto/evp/c_alld.c openssl-0.9.8h-ocf/crypto/evp/c_all EVP_add_digest(EVP_sha1()); EVP_add_digest_alias(SN_sha1,"ssl3-sha1"); EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA); -diff -Nur openssl-0.9.8h/engines/Makefile openssl-0.9.8h-ocf/engines/Makefile ---- openssl-0.9.8h/engines/Makefile 2006-02-04 02:49:34.000000000 +0100 -+++ openssl-0.9.8h-ocf/engines/Makefile 2008-07-12 04:18:53.000000000 +0200 -@@ -93,6 +93,7 @@ +diff -Naur openssl-0.9.8i.orig/engines/Makefile openssl-0.9.8i/engines/Makefile +--- openssl-0.9.8i.orig/engines/Makefile 2008-10-01 04:16:01.000000000 +0200 ++++ openssl-0.9.8i/engines/Makefile 2008-10-01 04:16:12.000000000 +0200 +@@ -96,6 +96,7 @@ ( echo installing $$l; \ if [ "$(PLATFORM)" != "Cygwin" ]; then \ case "$(CFLAGS)" in \ @@ -1167,9 +1169,9 @@ diff -Nur openssl-0.9.8h/engines/Makefile openssl-0.9.8h-ocf/engines/Makefile *DSO_DLFCN*) sfx="so";; \ *DSO_DL*) sfx="sl";; \ *) sfx="bad";; \ -diff -Nur openssl-0.9.8h/util/domd openssl-0.9.8h-ocf/util/domd ---- openssl-0.9.8h/util/domd 2005-03-30 16:44:50.000000000 +0200 -+++ openssl-0.9.8h-ocf/util/domd 2008-07-12 04:18:53.000000000 +0200 +diff -Naur openssl-0.9.8i.orig/util/domd openssl-0.9.8i/util/domd +--- openssl-0.9.8i.orig/util/domd 2008-10-01 04:16:01.000000000 +0200 ++++ openssl-0.9.8i/util/domd 2008-10-01 04:16:13.000000000 +0200 @@ -23,13 +23,17 @@ done sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp diff --git a/package/openssl/patches/300-etrax_support.patch b/package/openssl/patches/300-etrax_support.patch index 6343398417..89b3a92cc5 100644 --- a/package/openssl/patches/300-etrax_support.patch +++ b/package/openssl/patches/300-etrax_support.patch @@ -1,7 +1,7 @@ diff -urN openssl-0.9.8h.orig/Configure openssl-0.9.8h/Configure --- openssl-0.9.8h.orig/Configure 2008-05-02 01:11:30.000000000 +0200 +++ openssl-0.9.8h/Configure 2008-06-19 13:27:42.000000000 +0200 -@@ -385,6 +385,10 @@ +@@ -389,6 +389,10 @@ "qnx4", "cc:-DL_ENDIAN -DTERMIO::(unknown):::${x86_gcc_des} ${x86_gcc_opts}:", "qnx6", "cc:-DL_ENDIAN -DTERMIOS::(unknown)::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:",