From 179ba60e0e5007e9011700af573669e1ada17b2d Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Fri, 26 Mar 2010 14:29:14 +0000 Subject: [PATCH] package/openssl: refresh patches SVN-Revision: 20473 --- .../patches/110-optimize-for-size.patch | 2 - package/openssl/patches/120-makedepend.patch | 2 +- .../openssl/patches/140-makefile-dirs.patch | 2 +- package/openssl/patches/150-no_engines.patch | 2 +- .../patches/160-disable_doc_tests.patch | 12 +- .../openssl/patches/200-ocf-20080917.patch | 116 +++++++++--------- .../openssl/patches/300-etrax_support.patch | 6 +- 7 files changed, 70 insertions(+), 72 deletions(-) diff --git a/package/openssl/patches/110-optimize-for-size.patch b/package/openssl/patches/110-optimize-for-size.patch index 769a3d9366..ae35f50ce3 100644 --- a/package/openssl/patches/110-optimize-for-size.patch +++ b/package/openssl/patches/110-optimize-for-size.patch @@ -1,5 +1,3 @@ -diff --git a/Configure b/Configure -index 32e154b..eec5066 100755 --- a/Configure +++ b/Configure @@ -370,6 +370,8 @@ my %table=( diff --git a/package/openssl/patches/120-makedepend.patch b/package/openssl/patches/120-makedepend.patch index 95600ff8e8..4ed6f6d229 100644 --- a/package/openssl/patches/120-makedepend.patch +++ b/package/openssl/patches/120-makedepend.patch @@ -1,6 +1,6 @@ --- a/util/domd +++ b/util/domd -@@ -22,7 +23,7 @@ if [ "$MAKEDEPEND" = "gcc" ]; then +@@ -22,7 +22,7 @@ if expr "$MAKEDEPEND" : '.*gcc$' > /dev/ done sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp diff --git a/package/openssl/patches/140-makefile-dirs.patch b/package/openssl/patches/140-makefile-dirs.patch index 997978250f..84eee83ab6 100644 --- a/package/openssl/patches/140-makefile-dirs.patch +++ b/package/openssl/patches/140-makefile-dirs.patch @@ -1,6 +1,6 @@ --- a/Makefile.org +++ b/Makefile.org -@@ -131,7 +131,7 @@ FIPSCANLIB= +@@ -132,7 +132,7 @@ FIPSCANLIB= BASEADDR= diff --git a/package/openssl/patches/150-no_engines.patch b/package/openssl/patches/150-no_engines.patch index e344b49426..ed34698a85 100644 --- a/package/openssl/patches/150-no_engines.patch +++ b/package/openssl/patches/150-no_engines.patch @@ -1,6 +1,6 @@ --- a/Configure +++ b/Configure -@@ -1850,6 +1850,11 @@ EOF +@@ -1904,6 +1904,11 @@ EOF close(OUT); } diff --git a/package/openssl/patches/160-disable_doc_tests.patch b/package/openssl/patches/160-disable_doc_tests.patch index 32a6d29300..8c042ef6f6 100644 --- a/package/openssl/patches/160-disable_doc_tests.patch +++ b/package/openssl/patches/160-disable_doc_tests.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -133,7 +133,7 @@ FIPSCANLIB= +@@ -134,7 +134,7 @@ FIPSCANLIB= BASEADDR=0xFB00000 @@ -9,7 +9,7 @@ SHLIBDIRS= crypto ssl # dirs in crypto to build -@@ -150,7 +150,7 @@ SDIRS= \ +@@ -151,7 +151,7 @@ SDIRS= \ # tests to perform. "alltests" is a special word indicating that all tests # should be performed. @@ -18,7 +18,7 @@ MAKEFILE= Makefile -@@ -162,7 +162,7 @@ SHELL=/bin/sh +@@ -163,7 +163,7 @@ SHELL=/bin/sh TOP= . ONEDIRS=out tmp @@ -27,7 +27,7 @@ WDIRS= windows LIBS= libcrypto.a libssl.a SHARED_CRYPTO=libcrypto$(SHLIB_EXT) -@@ -321,7 +321,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \ +@@ -323,7 +323,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \ ../crypto/uid.o sub_all: build_all @@ -36,7 +36,7 @@ build_libs: build_crypto build_fips build_ssl build_shared build_engines -@@ -613,7 +613,7 @@ dist: +@@ -617,7 +617,7 @@ dist: dist_pem_h: (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) @@ -47,7 +47,7 @@ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ --- a/Makefile.org +++ b/Makefile.org -@@ -611,7 +611,7 @@ dist: +@@ -615,7 +615,7 @@ dist: dist_pem_h: (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) diff --git a/package/openssl/patches/200-ocf-20080917.patch b/package/openssl/patches/200-ocf-20080917.patch index 92520ea4eb..2c6c04a1a5 100644 --- a/package/openssl/patches/200-ocf-20080917.patch +++ b/package/openssl/patches/200-ocf-20080917.patch @@ -9,7 +9,7 @@ # # --test-sanity Make a number of sanity checks on the data in this file. # This is a debugging tool for OpenSSL developers. -@@ -547,6 +549,9 @@ my %table=( +@@ -554,6 +556,9 @@ my %table=( ##### Compaq Non-Stop Kernel (Tandem) "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::", @@ -19,7 +19,7 @@ ); my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -@@ -601,6 +606,8 @@ my $montasm=1; # but "no-montasm" is d +@@ -610,6 +615,8 @@ my $montasm=1; # but "no-montasm" is d my $no_asm=0; my $no_dso=0; my $no_gmp=0; @@ -28,9 +28,9 @@ my @skip=(); my $Makefile="Makefile"; my $des_locl="crypto/des/des_locl.h"; -@@ -749,6 +756,14 @@ PROCESS_ARGS: +@@ -762,6 +769,14 @@ PROCESS_ARGS: { - exit(&test_sanity()); + $strict_warnings = 1; } + elsif (/^--with-cryptodev$/) + { @@ -43,7 +43,7 @@ elsif (/^reconfigure/ || /^reconf/) { if (open(IN,"<$Makefile")) -@@ -1037,6 +1052,7 @@ foreach (sort (keys %disabled)) +@@ -1055,6 +1070,7 @@ foreach (sort (keys %disabled)) print " OPENSSL_NO_$ALGO"; if (/^err$/) { $flags .= "-DOPENSSL_NO_ERR "; } @@ -51,7 +51,7 @@ elsif (/^asm$/) { $no_asm = 1; } } else -@@ -1161,6 +1177,16 @@ if (!$no_krb5) +@@ -1184,6 +1200,16 @@ if (!$no_krb5) $withargs{"krb5-dir"} ne ""; } @@ -85,7 +85,7 @@ ---------------------- --- a/Makefile.org +++ b/Makefile.org -@@ -502,7 +502,7 @@ files: +@@ -504,7 +504,7 @@ files: links: @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl @@ -116,7 +116,7 @@ # on Unix, "cyg" for certain forms under Cygwin...) or suffix (.a, .so, --- a/config +++ b/config -@@ -270,7 +270,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in +@@ -270,7 +270,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${ echo "ppc-apple-darwin${VERSION}" ;; *) @@ -144,7 +144,7 @@ fi # Only set CC if not supplied already -@@ -493,6 +493,9 @@ echo Operating system: $GUESSOS +@@ -488,6 +491,9 @@ echo Operating system: $GUESSOS # script above so we end up with values in vars but that would take # more time that I want to waste at the moment case "$GUESSOS" in @@ -320,7 +320,7 @@ {FUNC_TYPE_MD,"md2",dgst_main}, --- a/apps/speed.c +++ b/apps/speed.c -@@ -292,7 +292,7 @@ static const char *names[ALGOR_NUM]={ +@@ -296,7 +296,7 @@ static const char *names[ALGOR_NUM]={ "evp","sha256","sha512", "aes-128 ige","aes-192 ige","aes-256 ige"}; static double results[ALGOR_NUM][SIZE_NUM]; @@ -329,7 +329,7 @@ #ifndef OPENSSL_NO_RSA static double rsa_results[RSA_NUM][2]; #endif -@@ -328,6 +328,79 @@ static SIGRETTYPE sig_done(int sig) +@@ -336,6 +336,79 @@ static SIGRETTYPE sig_done(int sig) #define START 0 #define STOP 1 @@ -409,7 +409,7 @@ #if defined(OPENSSL_SYS_NETWARE) /* for NetWare the best we can do is use clock() which returns the -@@ -358,6 +431,11 @@ static double Time_F(int s) +@@ -366,6 +439,11 @@ static double Time_F(int s) { double ret; @@ -421,7 +421,7 @@ #ifdef USE_TOD if(usertime) { -@@ -832,6 +910,14 @@ int MAIN(int argc, char **argv) +@@ -840,6 +918,14 @@ int MAIN(int argc, char **argv) j--; /* Otherwise, -elapsed gets confused with an algorithm. */ } @@ -436,8 +436,8 @@ else if ((argc > 0) && (strcmp(*argv,"-evp") == 0)) { argc--; -@@ -1260,6 +1346,9 @@ int MAIN(int argc, char **argv) - #ifdef HAVE_FORK +@@ -1268,6 +1354,9 @@ int MAIN(int argc, char **argv) + #ifndef NO_FORK BIO_printf(bio_err,"-multi n run n benchmarks in parallel.\n"); #endif +#ifdef __linux__ @@ -446,7 +446,7 @@ goto end; } argc--; -@@ -1267,11 +1356,6 @@ int MAIN(int argc, char **argv) +@@ -1275,11 +1364,6 @@ int MAIN(int argc, char **argv) j++; } @@ -458,7 +458,7 @@ if (j == 0) { for (i=0; icipher_data; struct session_op *sess = &state->d_sess; @@ -896,7 +896,7 @@ memset(sess, 0, sizeof(struct session_op)); -@@ -496,6 +531,20 @@ cryptodev_cleanup(EVP_CIPHER_CTX *ctx) +@@ -505,6 +540,20 @@ cryptodev_cleanup(EVP_CIPHER_CTX *ctx) * gets called when libcrypto requests a cipher NID. */ @@ -917,7 +917,7 @@ /* DES CBC EVP */ const EVP_CIPHER cryptodev_des_cbc = { NID_des_cbc, -@@ -563,6 +612,32 @@ const EVP_CIPHER cryptodev_aes_cbc = { +@@ -572,6 +621,32 @@ const EVP_CIPHER cryptodev_aes_cbc = { NULL }; @@ -950,7 +950,7 @@ /* * Registered by the ENGINE when used to find out how to deal with * a particular NID in the ENGINE. this says what we'll do at the -@@ -576,6 +651,9 @@ cryptodev_engine_ciphers(ENGINE *e, cons +@@ -585,6 +660,9 @@ cryptodev_engine_ciphers(ENGINE *e, cons return (cryptodev_usable_ciphers(nids)); switch (nid) { @@ -960,7 +960,7 @@ case NID_des_ede3_cbc: *cipher = &cryptodev_3des_cbc; break; -@@ -591,6 +669,12 @@ cryptodev_engine_ciphers(ENGINE *e, cons +@@ -600,6 +678,12 @@ cryptodev_engine_ciphers(ENGINE *e, cons case NID_aes_128_cbc: *cipher = &cryptodev_aes_cbc; break; @@ -973,7 +973,7 @@ default: *cipher = NULL; break; -@@ -598,6 +682,234 @@ cryptodev_engine_ciphers(ENGINE *e, cons +@@ -607,6 +691,234 @@ cryptodev_engine_ciphers(ENGINE *e, cons return (*cipher != NULL); } @@ -1208,7 +1208,7 @@ static int cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest, const int **nids, int nid) -@@ -606,10 +918,15 @@ cryptodev_engine_digests(ENGINE *e, cons +@@ -615,10 +927,15 @@ cryptodev_engine_digests(ENGINE *e, cons return (cryptodev_usable_digests(nids)); switch (nid) { @@ -1225,15 +1225,15 @@ *digest = NULL; break; } -@@ -637,6 +954,7 @@ bn2crparam(const BIGNUM *a, struct crpar +@@ -646,6 +963,7 @@ bn2crparam(const BIGNUM *a, struct crpar b = malloc(bytes); if (b == NULL) return (1); + memset(b, 0, bytes); - crp->crp_p = b; + crp->crp_p = (char *)b; crp->crp_nbits = bits; -@@ -681,7 +999,7 @@ zapparams(struct crypt_kop *kop) +@@ -690,7 +1008,7 @@ zapparams(struct crypt_kop *kop) { int i; @@ -1244,7 +1244,7 @@ kop->crk_param[i].crp_p = NULL; --- a/crypto/engine/engine.h +++ b/crypto/engine/engine.h -@@ -703,7 +703,7 @@ typedef int (*dynamic_bind_engine)(ENGIN +@@ -705,7 +705,7 @@ typedef int (*dynamic_bind_engine)(ENGIN * values. */ void *ENGINE_get_static_state(void); @@ -1266,7 +1266,7 @@ #endif --- a/crypto/evp/c_alld.c +++ b/crypto/evp/c_alld.c -@@ -81,7 +81,7 @@ void OpenSSL_add_all_digests(void) +@@ -78,7 +78,7 @@ void OpenSSL_add_all_digests(void) EVP_add_digest(EVP_dss()); #endif #endif @@ -1277,7 +1277,7 @@ EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA); --- a/engines/Makefile +++ b/engines/Makefile -@@ -96,6 +96,7 @@ install: +@@ -97,6 +97,7 @@ install: ( echo installing $$l; \ if [ "$(PLATFORM)" != "Cygwin" ]; then \ case "$(CFLAGS)" in \ @@ -1287,7 +1287,7 @@ *) sfx="bad";; \ --- a/util/domd +++ b/util/domd -@@ -23,13 +23,17 @@ if [ "$D" = "gcc" ]; then +@@ -22,13 +22,17 @@ if expr "$MAKEDEPEND" : '.*gcc$' > /dev/ done sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp diff --git a/package/openssl/patches/300-etrax_support.patch b/package/openssl/patches/300-etrax_support.patch index 758ebeb765..74c9442d53 100644 --- a/package/openssl/patches/300-etrax_support.patch +++ b/package/openssl/patches/300-etrax_support.patch @@ -1,8 +1,8 @@ --- a/Configure +++ b/Configure -@@ -396,6 +396,10 @@ my %table=( - "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}:", +@@ -403,6 +403,10 @@ my %table=( + "QNX6", "gcc:-DTERMIOS::::-lsocket::${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "QNX6-i386", "gcc:-DL_ENDIAN -DTERMIOS -O2 -Wall::::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +# cris +"linux-cris", "\$(TARGET_CC):-DL_ENDIAN -DTERMIO -fomit-frame-pointer::-D_REENTRANT::-ldl:BN_LLONG THIRTY_TWO_BIT RC4_CHAR::::::::::::dlfcn:linux-shared:-fpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::", -- 2.25.1