diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-12 10:36:27 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-12 13:34:15 +0200 |
commit | 37bb9326f5b5de023544056650ab326cf03173e8 (patch) | |
tree | 24263035af23031b9bdf841d4ee007e0d4a3f52d | |
parent | 8fe0e03a8de2750e8b3e5e7dd123cd28c01dbcb5 (diff) | |
download | ptxdist-37bb9326f5b5de023544056650ab326cf03173e8.tar.gz ptxdist-37bb9326f5b5de023544056650ab326cf03173e8.tar.xz |
openssl: version bump 1.0.1m -> 1.0.2b
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/openssl-1.0.1m/0002-debian-targets.patch | 82 | ||||
-rw-r--r-- | patches/openssl-1.0.1m/0008-rehash-crt.patch | 44 | ||||
-rw-r--r-- | patches/openssl-1.0.1m/0012-Change-default-bit-size-and-digest.patch | 131 | ||||
-rw-r--r-- | patches/openssl-1.0.1m/0013-openssl_fix_for_x32.patch | 50 | ||||
-rw-r--r-- | patches/openssl-1.0.2b/0001-ca.patch (renamed from patches/openssl-1.0.1m/0001-ca.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2b/0002-debian-targets.patch | 82 | ||||
-rw-r--r-- | patches/openssl-1.0.2b/0003-engines-path.patch (renamed from patches/openssl-1.0.1m/0003-engines-path.patch) | 49 | ||||
-rw-r--r-- | patches/openssl-1.0.2b/0004-no-rpath.patch (renamed from patches/openssl-1.0.1m/0004-no-rpath.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2b/0005-no-symbolic.patch (renamed from patches/openssl-1.0.1m/0005-no-symbolic.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2b/0006-pic.patch (renamed from patches/openssl-1.0.1m/0006-pic.patch) | 18 | ||||
-rw-r--r-- | patches/openssl-1.0.2b/0007-valgrind.patch (renamed from patches/openssl-1.0.1m/0007-valgrind.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2b/0008-shared-lib-ext.patch (renamed from patches/openssl-1.0.1m/0009-shared-lib-ext.patch) | 8 | ||||
-rw-r--r-- | patches/openssl-1.0.2b/0009-block_diginotar.patch (renamed from patches/openssl-1.0.1m/0010-block_diginotar.patch) | 12 | ||||
-rw-r--r-- | patches/openssl-1.0.2b/0010-block_digicert_malaysia.patch (renamed from patches/openssl-1.0.1m/0011-block_digicert_malaysia.patch) | 8 | ||||
-rw-r--r-- | patches/openssl-1.0.2b/0011-Disable-the-freelist.patch | 42 | ||||
-rw-r--r-- | patches/openssl-1.0.2b/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch (renamed from patches/openssl-1.0.1m/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch) | 6 | ||||
-rw-r--r-- | patches/openssl-1.0.2b/0101-fix-parallel-building.patch (renamed from patches/openssl-1.0.1m/0101-fix-parallel-building.patch) | 16 | ||||
-rw-r--r-- | patches/openssl-1.0.2b/series (renamed from patches/openssl-1.0.1m/series) | 12 | ||||
-rw-r--r-- | rules/openssl.make | 4 |
19 files changed, 202 insertions, 378 deletions
diff --git a/patches/openssl-1.0.1m/0002-debian-targets.patch b/patches/openssl-1.0.1m/0002-debian-targets.patch deleted file mode 100644 index 8c7b7675b..000000000 --- a/patches/openssl-1.0.1m/0002-debian-targets.patch +++ /dev/null @@ -1,82 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sat, 10 Jan 2015 09:16:02 +0100 -Subject: [PATCH] debian-targets - -Imported from openssl_1.0.1k-1.debian.tar.xz - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - Configure | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 53 insertions(+) - -diff --git a/Configure b/Configure -index d7ecf973c0a6..70cab84d8d72 100755 ---- a/Configure -+++ b/Configure -@@ -105,6 +105,10 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta - - my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED"; - -+# There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS -+my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . `dpkg-buildflags --get LDFLAGS` . "-Wa,--noexecstack -Wall"; -+$debian_cflags =~ s/\n/ /g; -+ - my $strict_warnings = 0; - - my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL"; -@@ -340,6 +344,55 @@ my %table=( - "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", - "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so", - -+# Debian GNU/* (various architectures) -+"debian-alpha","gcc:-DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-alpha-ev4","gcc:-DTERMIO ${debian_cflags} -mcpu=ev4::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-alpha-ev5","gcc:-DTERMIO ${debian_cflags} -mcpu=ev5::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-arm64","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-armel","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-armhf","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::", -+"debian-avr32", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -fomit-frame-pointer::-D_REENTRANT::-ldl:BN_LLONG_BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS ${debian_cflags} -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-hppa","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-ia64","gcc:-DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-i386","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags} -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags} -march=i586::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags} -march=i686::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-m68k","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-mips", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-mipsel", "gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-mipsn32", "mips64-linux-gnuabin32-gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-mipsn32el", "mips64el-linux-gnuabin32-gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-mips64", "mips64-linux-gnuabi64-gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-mips64el", "mips64el-linux-gnuabi64-gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS ${debian_cflags}::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-netbsd-sparc", "gcc:-DB_ENDIAN -DTERMIOS ${debian_cflags} -mv8::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-openbsd-alpha","gcc:-DTERMIOS ${debian_cflags}::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-openbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-openbsd-mips","gcc:-DL_ENDIAN ${debian_cflags}::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-or1k", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-powerpcspe","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-ppc64el","gcc:-m64 -DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64le:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-s390","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-s390x","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-sh3", "gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-sh4", "gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-sh3eb", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-sh4eb", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-m32r","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-sparc","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -mcpu=v8 -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -mcpu=v9 -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-sparc64","gcc:-m64 -DB_ENDIAN -DTERMIO ${debian_cflags} -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-x32","gcc:-mx32 -DL_ENDIAN -DTERMIO ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32", -+ - #### - #### Variety of LINUX:-) - #### diff --git a/patches/openssl-1.0.1m/0008-rehash-crt.patch b/patches/openssl-1.0.1m/0008-rehash-crt.patch deleted file mode 100644 index 2dbcaaf3f..000000000 --- a/patches/openssl-1.0.1m/0008-rehash-crt.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sat, 10 Jan 2015 09:16:02 +0100 -Subject: [PATCH] rehash-crt - -Imported from openssl_1.0.1k-1.debian.tar.xz - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - tools/c_rehash.in | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/tools/c_rehash.in b/tools/c_rehash.in -index bfc4a69ed4bc..4958e3dd05a7 100644 ---- a/tools/c_rehash.in -+++ b/tools/c_rehash.in -@@ -75,12 +75,15 @@ sub hash_dir { - } - } - closedir DIR; -- FILE: foreach $fname (grep {/\.pem$/} @flist) { -+ FILE: foreach $fname (grep {/\.pem$|\.crt$/} @flist) { - # Check to see if certificates and/or CRLs present. - my ($cert, $crl) = check_file($fname); - if(!$cert && !$crl) { -- print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n"; -- next; -+ ($cert, $crl) = check_file("$openssl x509 -in \"$fname\" -inform der -outform pem | "); -+ if(!$cert && !$crl) { -+ print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n"; -+ next; -+ } - } - link_hash_cert($fname) if($cert); - link_hash_crl($fname) if($crl); -@@ -153,6 +156,9 @@ sub link_hash_crl { - my $fname = $_[0]; - $fname =~ s/'/'\\''/g; - my ($hash, $fprint) = `"$openssl" crl -hash -fingerprint -noout -in '$fname'`; -+ if(!$hash || !fprint) { -+ ($hash, $fprint) = `"$openssl" crl -hash -fingerprint -noout -in '$fname' -inform der`; -+ } - chomp $hash; - chomp $fprint; - $fprint =~ s/^.*=//; diff --git a/patches/openssl-1.0.1m/0012-Change-default-bit-size-and-digest.patch b/patches/openssl-1.0.1m/0012-Change-default-bit-size-and-digest.patch deleted file mode 100644 index 961e81982..000000000 --- a/patches/openssl-1.0.1m/0012-Change-default-bit-size-and-digest.patch +++ /dev/null @@ -1,131 +0,0 @@ -From: Kurt Roeckx <kurt@roeckx.be> -Date: Fri, 1 Nov 2013 20:47:14 +0100 -Subject: [PATCH] Change default bit size and digest - -Imported from openssl_1.0.1k-1.debian.tar.xz - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - apps/dhparam.c | 4 ++-- - apps/gendh.c | 2 +- - apps/genrsa.c | 2 +- - apps/openssl.cnf | 2 +- - crypto/dsa/dsa_ameth.c | 2 +- - crypto/ec/ec_ameth.c | 2 +- - crypto/hmac/hm_ameth.c | 2 +- - crypto/rsa/rsa_ameth.c | 2 +- - 8 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/apps/dhparam.c b/apps/dhparam.c -index f86311c28fd3..d3b6d58ad2e5 100644 ---- a/apps/dhparam.c -+++ b/apps/dhparam.c -@@ -130,7 +130,7 @@ - # undef PROG - # define PROG dhparam_main - --# define DEFBITS 512 -+# define DEFBITS 2048 - - /*- - * -inform arg - input format - default PEM (DER or PEM) -@@ -254,7 +254,7 @@ int MAIN(int argc, char **argv) - BIO_printf(bio_err, - " -5 generate parameters using 5 as the generator value\n"); - BIO_printf(bio_err, -- " numbits number of bits in to generate (default 512)\n"); -+ " numbits number of bits in to generate (default 2048)\n"); - # ifndef OPENSSL_NO_ENGINE - BIO_printf(bio_err, - " -engine e use engine e, possibly a hardware device.\n"); -diff --git a/apps/gendh.c b/apps/gendh.c -index adaa101783df..fef6f1b1774d 100644 ---- a/apps/gendh.c -+++ b/apps/gendh.c -@@ -80,7 +80,7 @@ - # include <openssl/x509.h> - # include <openssl/pem.h> - --# define DEFBITS 512 -+# define DEFBITS 2048 - # undef PROG - # define PROG gendh_main - -diff --git a/apps/genrsa.c b/apps/genrsa.c -index 2eabadcc6b28..91e6550a5767 100644 ---- a/apps/genrsa.c -+++ b/apps/genrsa.c -@@ -80,7 +80,7 @@ - # include <openssl/pem.h> - # include <openssl/rand.h> - --# define DEFBITS 1024 -+# define DEFBITS 2048 - # undef PROG - # define PROG genrsa_main - -diff --git a/apps/openssl.cnf b/apps/openssl.cnf -index 18760c6e673d..1eb86c401263 100644 ---- a/apps/openssl.cnf -+++ b/apps/openssl.cnf -@@ -103,7 +103,7 @@ emailAddress = optional - - #################################################################### - [ req ] --default_bits = 1024 -+default_bits = 2048 - default_keyfile = privkey.pem - distinguished_name = req_distinguished_name - attributes = req_attributes -diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c -index a2840eaed095..7560c5d6145c 100644 ---- a/crypto/dsa/dsa_ameth.c -+++ b/crypto/dsa/dsa_ameth.c -@@ -604,7 +604,7 @@ static int dsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2) - #endif - - case ASN1_PKEY_CTRL_DEFAULT_MD_NID: -- *(int *)arg2 = NID_sha1; -+ *(int *)arg2 = NID_sha256; - return 2; - - default: -diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c -index 5cefb5ad303a..b76c0211430d 100644 ---- a/crypto/ec/ec_ameth.c -+++ b/crypto/ec/ec_ameth.c -@@ -583,7 +583,7 @@ static int ec_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2) - #endif - - case ASN1_PKEY_CTRL_DEFAULT_MD_NID: -- *(int *)arg2 = NID_sha1; -+ *(int *)arg2 = NID_sha256; - return 2; - - default: -diff --git a/crypto/hmac/hm_ameth.c b/crypto/hmac/hm_ameth.c -index 641c797ef1d5..29b2b5dffcf7 100644 ---- a/crypto/hmac/hm_ameth.c -+++ b/crypto/hmac/hm_ameth.c -@@ -87,7 +87,7 @@ static int hmac_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2) - { - switch (op) { - case ASN1_PKEY_CTRL_DEFAULT_MD_NID: -- *(int *)arg2 = NID_sha1; -+ *(int *)arg2 = NID_sha256; - return 1; - - default: -diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c -index 93e071de75e2..a42ddc127524 100644 ---- a/crypto/rsa/rsa_ameth.c -+++ b/crypto/rsa/rsa_ameth.c -@@ -411,7 +411,7 @@ static int rsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2) - #endif - - case ASN1_PKEY_CTRL_DEFAULT_MD_NID: -- *(int *)arg2 = NID_sha1; -+ *(int *)arg2 = NID_sha256; - return 1; - - default: diff --git a/patches/openssl-1.0.1m/0013-openssl_fix_for_x32.patch b/patches/openssl-1.0.1m/0013-openssl_fix_for_x32.patch deleted file mode 100644 index 8461760ea..000000000 --- a/patches/openssl-1.0.1m/0013-openssl_fix_for_x32.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sat, 10 Jan 2015 09:16:02 +0100 -Subject: [PATCH] openssl_fix_for_x32 - -Imported from openssl_1.0.1k-1.debian.tar.xz - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - crypto/bn/asm/x86_64-gcc.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/crypto/bn/asm/x86_64-gcc.c b/crypto/bn/asm/x86_64-gcc.c -index 9c5074b30858..38e52d9b2a42 100644 ---- a/crypto/bn/asm/x86_64-gcc.c -+++ b/crypto/bn/asm/x86_64-gcc.c -@@ -55,7 +55,7 @@ - * machine. - */ - --# ifdef _WIN64 -+# if defined _WIN64 || !defined __LP64__ - # define BN_ULONG unsigned long long - # else - # define BN_ULONG unsigned long -@@ -211,9 +211,9 @@ BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, - - asm volatile (" subq %2,%2 \n" - ".p2align 4 \n" -- "1: movq (%4,%2,8),%0 \n" -- " adcq (%5,%2,8),%0 \n" -- " movq %0,(%3,%2,8) \n" -+ "1: movq (%q4,%2,8),%0 \n" -+ " adcq (%q5,%2,8),%0 \n" -+ " movq %0,(%q3,%2,8) \n" - " leaq 1(%2),%2 \n" - " loop 1b \n" - " sbbq %0,%0 \n":"=&a" (ret), "+c"(n), -@@ -235,9 +235,9 @@ BN_ULONG bn_sub_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, - - asm volatile (" subq %2,%2 \n" - ".p2align 4 \n" -- "1: movq (%4,%2,8),%0 \n" -- " sbbq (%5,%2,8),%0 \n" -- " movq %0,(%3,%2,8) \n" -+ "1: movq (%q4,%2,8),%0 \n" -+ " sbbq (%q5,%2,8),%0 \n" -+ " movq %0,(%q3,%2,8) \n" - " leaq 1(%2),%2 \n" - " loop 1b \n" - " sbbq %0,%0 \n":"=&a" (ret), "+c"(n), diff --git a/patches/openssl-1.0.1m/0001-ca.patch b/patches/openssl-1.0.2b/0001-ca.patch index 471b5ba9e..ee1f26bb7 100644 --- a/patches/openssl-1.0.1m/0001-ca.patch +++ b/patches/openssl-1.0.2b/0001-ca.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sat, 10 Jan 2015 09:16:02 +0100 +Date: Fri, 12 Jun 2015 10:34:14 +0200 Subject: [PATCH] ca -Imported from openssl_1.0.1k-1.debian.tar.xz +Imported from openssl_1.0.2b-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.2b/0002-debian-targets.patch b/patches/openssl-1.0.2b/0002-debian-targets.patch new file mode 100644 index 000000000..9299c3243 --- /dev/null +++ b/patches/openssl-1.0.2b/0002-debian-targets.patch @@ -0,0 +1,82 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Fri, 12 Jun 2015 10:34:14 +0200 +Subject: [PATCH] debian-targets + +Imported from openssl_1.0.2b-1.debian.tar.xz + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + Configure | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 53 insertions(+) + +diff --git a/Configure b/Configure +index d99eed7f9303..a8c5d393f699 100755 +--- a/Configure ++++ b/Configure +@@ -124,6 +124,10 @@ my $clang_disabled_warnings = "-Wno-unused-parameter -Wno-missing-field-initiali + # -Wextended-offsetof + my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers -Wno-language-extension-token -Wno-extended-offsetof -Qunused-arguments"; + ++# There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS ++my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . `dpkg-buildflags --get LDFLAGS` . "-Wa,--noexecstack -Wall"; ++$debian_cflags =~ s/\n/ /g; ++ + my $strict_warnings = 0; + + my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL"; +@@ -360,6 +364,55 @@ my %table=( + "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", + "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so", + ++# Debian GNU/* (various architectures) ++"debian-alpha","gcc:${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-alpha-ev4","gcc:${debian_cflags} -mcpu=ev4::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-alpha-ev5","gcc:${debian_cflags} -mcpu=ev5::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-arm64","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-armel","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-armhf","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-amd64", "gcc:-m64 -DL_ENDIAN ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::", ++"debian-avr32", "gcc:-DB_ENDIAN ${debian_cflags} -fomit-frame-pointer::-D_REENTRANT::-ldl:BN_LLONG_BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-kfreebsd-i386","gcc:-DL_ENDIAN ${debian_cflags} -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-hppa","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-hurd-i386","gcc:-DL_ENDIAN -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-ia64","gcc:${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-i386","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-i386-i486","gcc:-DL_ENDIAN ${debian_cflags} -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-i386-i586","gcc:-DL_ENDIAN ${debian_cflags} -march=i586::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-i386-i686/cmov","gcc:-DL_ENDIAN ${debian_cflags} -march=i686::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-m68k","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mips", "gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mipsel", "gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mipsn32", "mips64-linux-gnuabin32-gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mipsn32el", "mips64el-linux-gnuabin32-gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mips64", "mips64-linux-gnuabi64-gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mips64el", "mips64el-linux-gnuabi64-gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-netbsd-i386", "gcc:-DL_ENDIAN ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-netbsd-m68k", "gcc:-DB_ENDIAN ${debian_cflags}::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-netbsd-sparc", "gcc:-DB_ENDIAN ${debian_cflags} -mv8::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-openbsd-alpha","gcc:${debian_cflags}::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-openbsd-i386", "gcc:-DL_ENDIAN ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-openbsd-mips","gcc:-DL_ENDIAN ${debian_cflags}::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-or1k", "gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-powerpc","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-powerpcspe","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-ppc64","gcc:-m64 -DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-ppc64el","gcc:-m64 -DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64le:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-s390","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-s390x","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sh3", "gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sh4", "gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sh3eb", "gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sh4eb", "gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-m32r","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sparc","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sparc-v8","gcc:-DB_ENDIAN ${debian_cflags} -mcpu=v8 -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sparc-v9","gcc:-DB_ENDIAN ${debian_cflags} -mcpu=v9 -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-sparc64","gcc:-m64 -DB_ENDIAN ${debian_cflags} -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-x32","gcc:-mx32 -DL_ENDIAN ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32", ++ + #### + #### Variety of LINUX:-) + #### diff --git a/patches/openssl-1.0.1m/0003-engines-path.patch b/patches/openssl-1.0.2b/0003-engines-path.patch index f56b0383f..1061e1c57 100644 --- a/patches/openssl-1.0.1m/0003-engines-path.patch +++ b/patches/openssl-1.0.2b/0003-engines-path.patch @@ -1,22 +1,22 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sat, 10 Jan 2015 09:16:02 +0100 +Date: Fri, 12 Jun 2015 10:34:14 +0200 Subject: [PATCH] engines-path -Imported from openssl_1.0.1k-1.debian.tar.xz +Imported from openssl_1.0.2b-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- Configure | 2 +- Makefile.org | 2 +- engines/Makefile | 10 +++++----- - engines/ccgost/Makefile | 6 +++--- - 4 files changed, 10 insertions(+), 10 deletions(-) + engines/ccgost/Makefile | 8 ++++---- + 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Configure b/Configure -index 70cab84d8d72..ad698c2255d2 100755 +index a8c5d393f699..37c748791db8 100755 --- a/Configure +++ b/Configure -@@ -1866,7 +1866,7 @@ while (<IN>) +@@ -1951,7 +1951,7 @@ while (<IN>) } elsif (/^#define\s+ENGINESDIR/) { @@ -26,10 +26,10 @@ index 70cab84d8d72..ad698c2255d2 100755 print OUT "#define ENGINESDIR \"$foo\"\n"; } diff --git a/Makefile.org b/Makefile.org -index c92806f9201f..5117a0ef9c0b 100644 +index 9f4faae2df95..f450f2b10b63 100644 --- a/Makefile.org +++ b/Makefile.org -@@ -543,7 +543,7 @@ install: all install_docs install_sw +@@ -531,7 +531,7 @@ install: all install_docs install_sw install_sw: @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ @@ -39,10 +39,10 @@ index c92806f9201f..5117a0ef9c0b 100644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ diff --git a/engines/Makefile b/engines/Makefile -index 2fa9534401b1..58e028131786 100644 +index 2058ff405afe..315ef1ef780d 100644 --- a/engines/Makefile +++ b/engines/Makefile -@@ -107,7 +107,7 @@ install: +@@ -107,13 +107,13 @@ install: @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... @if [ -n "$(SHARED_LIBS)" ]; then \ set -e; \ @@ -51,16 +51,19 @@ index 2fa9534401b1..58e028131786 100644 for l in $(LIBNAMES); do \ ( echo installing $$l; \ pfx=lib; \ -@@ -119,13 +119,13 @@ install: + if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ + sfx=".so"; \ +- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ ++ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx.new; \ + else \ + case "$(CFLAGS)" in \ + *DSO_BEOS*) sfx=".so";; \ +@@ -122,10 +122,10 @@ install: *DSO_WIN32*) sfx="eay32.dll"; pfx=;; \ *) sfx=".bad";; \ esac; \ - cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ + cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx.new; \ - else \ - sfx=".so"; \ -- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ -+ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx.new; \ fi; \ - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ @@ -70,18 +73,24 @@ index 2fa9534401b1..58e028131786 100644 fi @target=install; $(RECURSIVE_MAKE) diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile -index d661c1082851..3e593b1e3e03 100644 +index 17e1efbdff30..186e99b83483 100644 --- a/engines/ccgost/Makefile +++ b/engines/ccgost/Makefile -@@ -53,13 +53,13 @@ install: +@@ -47,7 +47,7 @@ install: + pfx=lib; \ + if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ + sfx=".so"; \ +- cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ ++ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx.new; \ + else \ + case "$(CFLAGS)" in \ + *DSO_BEOS*) sfx=".so";; \ +@@ -56,10 +56,10 @@ install: *DSO_WIN32*) sfx="eay32.dll"; pfx=;; \ *) sfx=".bad";; \ esac; \ - cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ + cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx.new; \ - else \ - sfx=".so"; \ - cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ fi; \ - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \ diff --git a/patches/openssl-1.0.1m/0004-no-rpath.patch b/patches/openssl-1.0.2b/0004-no-rpath.patch index a48ef658f..9f7c54f43 100644 --- a/patches/openssl-1.0.1m/0004-no-rpath.patch +++ b/patches/openssl-1.0.2b/0004-no-rpath.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sat, 10 Jan 2015 09:16:02 +0100 +Date: Fri, 12 Jun 2015 10:34:14 +0200 Subject: [PATCH] no-rpath -Imported from openssl_1.0.1k-1.debian.tar.xz +Imported from openssl_1.0.2b-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.1m/0005-no-symbolic.patch b/patches/openssl-1.0.2b/0005-no-symbolic.patch index 42df2e56b..03e320c96 100644 --- a/patches/openssl-1.0.1m/0005-no-symbolic.patch +++ b/patches/openssl-1.0.2b/0005-no-symbolic.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sat, 10 Jan 2015 09:16:02 +0100 +Date: Fri, 12 Jun 2015 10:34:14 +0200 Subject: [PATCH] no-symbolic -Imported from openssl_1.0.1k-1.debian.tar.xz +Imported from openssl_1.0.2b-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.1m/0006-pic.patch b/patches/openssl-1.0.2b/0006-pic.patch index 20b1b6833..49d6f8e52 100644 --- a/patches/openssl-1.0.1m/0006-pic.patch +++ b/patches/openssl-1.0.2b/0006-pic.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sat, 10 Jan 2015 09:16:02 +0100 +Date: Fri, 12 Jun 2015 10:34:14 +0200 Subject: [PATCH] pic -Imported from openssl_1.0.1k-1.debian.tar.xz +Imported from openssl_1.0.2b-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- @@ -110,10 +110,10 @@ index 24561e759aba..269fb0b0c69f 100644 &mov("eax", &DWP($data_off,"esp","",0)); # get return &mov("ebx", &DWP($data_off+4,"esp","",0)); # diff --git a/crypto/perlasm/x86gas.pl b/crypto/perlasm/x86gas.pl -index 682a3a3163e2..9d4662cb9624 100644 +index 63b2301fd1f0..176b04d24521 100644 --- a/crypto/perlasm/x86gas.pl +++ b/crypto/perlasm/x86gas.pl -@@ -161,6 +161,7 @@ sub ::file_end +@@ -163,6 +163,7 @@ sub ::file_end if ($::macosx) { push (@out,"$tmp,2\n"); } elsif ($::elf) { push (@out,"$tmp,4\n"); } else { push (@out,"$tmp\n"); } @@ -121,7 +121,7 @@ index 682a3a3163e2..9d4662cb9624 100644 } push(@out,$initseg) if ($initseg); } -@@ -218,8 +219,23 @@ ___ +@@ -221,8 +222,23 @@ ___ elsif ($::elf) { $initseg.=<<___; .section .init @@ -146,7 +146,7 @@ index 682a3a3163e2..9d4662cb9624 100644 elsif ($::coff) { $initseg.=<<___; # applies to both Cygwin and Mingw diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl -index b270b44337d1..c01ba8383401 100644 +index e95f6274f5e0..6e8329d78589 100644 --- a/crypto/x86cpuid.pl +++ b/crypto/x86cpuid.pl @@ -8,6 +8,8 @@ require "x86asm.pl"; @@ -158,7 +158,7 @@ index b270b44337d1..c01ba8383401 100644 &function_begin("OPENSSL_ia32_cpuid"); &xor ("edx","edx"); &pushf (); -@@ -141,9 +143,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } +@@ -155,9 +157,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } &set_label("nocpuid"); &function_end("OPENSSL_ia32_cpuid"); @@ -169,7 +169,7 @@ index b270b44337d1..c01ba8383401 100644 &xor ("eax","eax"); &xor ("edx","edx"); &picmeup("ecx","OPENSSL_ia32cap_P"); -@@ -157,7 +157,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } +@@ -171,7 +171,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } # This works in Ring 0 only [read DJGPP+MS-DOS+privileged DPMI host], # but it's safe to call it on any [supported] 32-bit platform... # Just check for [non-]zero return value... @@ -178,7 +178,7 @@ index b270b44337d1..c01ba8383401 100644 &picmeup("ecx","OPENSSL_ia32cap_P"); &bt (&DWP(0,"ecx"),4); &jnc (&label("nohalt")); # no TSC -@@ -224,7 +224,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } +@@ -238,7 +238,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } &ret (); &function_end_B("OPENSSL_far_spin"); diff --git a/patches/openssl-1.0.1m/0007-valgrind.patch b/patches/openssl-1.0.2b/0007-valgrind.patch index f1d042660..567e6c311 100644 --- a/patches/openssl-1.0.1m/0007-valgrind.patch +++ b/patches/openssl-1.0.2b/0007-valgrind.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sat, 10 Jan 2015 09:16:02 +0100 +Date: Fri, 12 Jun 2015 10:34:14 +0200 Subject: [PATCH] valgrind -Imported from openssl_1.0.1k-1.debian.tar.xz +Imported from openssl_1.0.2b-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.1m/0009-shared-lib-ext.patch b/patches/openssl-1.0.2b/0008-shared-lib-ext.patch index 4d149008e..4590c6c3a 100644 --- a/patches/openssl-1.0.1m/0009-shared-lib-ext.patch +++ b/patches/openssl-1.0.2b/0008-shared-lib-ext.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sat, 10 Jan 2015 09:16:02 +0100 +Date: Fri, 12 Jun 2015 10:34:14 +0200 Subject: [PATCH] shared-lib-ext -Imported from openssl_1.0.1k-1.debian.tar.xz +Imported from openssl_1.0.2b-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- @@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Configure b/Configure -index ad698c2255d2..ae41bf75b03f 100755 +index 37c748791db8..3f8c736f763a 100755 --- a/Configure +++ b/Configure -@@ -1733,7 +1733,8 @@ while (<IN>) +@@ -1817,7 +1817,8 @@ while (<IN>) elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) { my $sotmp = $1; diff --git a/patches/openssl-1.0.1m/0010-block_diginotar.patch b/patches/openssl-1.0.2b/0009-block_diginotar.patch index 331f14fe6..8a4af3dcf 100644 --- a/patches/openssl-1.0.1m/0010-block_diginotar.patch +++ b/patches/openssl-1.0.2b/0009-block_diginotar.patch @@ -1,11 +1,11 @@ From: Raphael Geissert <geissert@debian.org> -Date: Sat, 10 Jan 2015 09:16:02 +0100 +Date: Fri, 12 Jun 2015 10:34:14 +0200 Subject: [PATCH] block_diginotar This is not meant as final patch. -Imported from openssl_1.0.1k-1.debian.tar.xz +Imported from openssl_1.0.2b-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- @@ -13,10 +13,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 27 insertions(+) diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c -index 136bfbda617a..60f9754db1a7 100644 +index 8ce41f9c9a8e..452b09a891ec 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c -@@ -117,6 +117,7 @@ static int check_trust(X509_STORE_CTX *ctx); +@@ -119,6 +119,7 @@ static int check_trust(X509_STORE_CTX *ctx); static int check_revocation(X509_STORE_CTX *ctx); static int check_cert(X509_STORE_CTX *ctx); static int check_policy(X509_STORE_CTX *ctx); @@ -24,7 +24,7 @@ index 136bfbda617a..60f9754db1a7 100644 static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer, unsigned int *preasons, X509_CRL *crl, X509 *x); -@@ -370,6 +371,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx) +@@ -475,6 +476,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx) if (!ok) goto end; @@ -34,7 +34,7 @@ index 136bfbda617a..60f9754db1a7 100644 #ifndef OPENSSL_NO_RFC3779 /* RFC 3779 path validation, now that CRL check has been done */ ok = v3_asid_validate_path(ctx); -@@ -804,6 +808,29 @@ static int check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify) +@@ -975,6 +979,29 @@ static int check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify) return 1; } diff --git a/patches/openssl-1.0.1m/0011-block_digicert_malaysia.patch b/patches/openssl-1.0.2b/0010-block_digicert_malaysia.patch index 7eba7a835..c498ba7c6 100644 --- a/patches/openssl-1.0.1m/0011-block_digicert_malaysia.patch +++ b/patches/openssl-1.0.2b/0010-block_digicert_malaysia.patch @@ -1,8 +1,8 @@ From: Raphael Geissert <geissert@debian.org> -Date: Sat, 10 Jan 2015 09:16:02 +0100 +Date: Fri, 12 Jun 2015 10:34:14 +0200 Subject: [PATCH] block_digicert_malaysia -Imported from openssl_1.0.1k-1.debian.tar.xz +Imported from openssl_1.0.2b-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- @@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c -index 60f9754db1a7..07eea072059a 100644 +index 452b09a891ec..75fc9b8e3a76 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c -@@ -816,10 +816,11 @@ static int check_ca_blacklist(X509_STORE_CTX *ctx) +@@ -987,10 +987,11 @@ static int check_ca_blacklist(X509_STORE_CTX *ctx) for (i = sk_X509_num(ctx->chain) - 1; i >= 0; i--) { x = sk_X509_value(ctx->chain, i); diff --git a/patches/openssl-1.0.2b/0011-Disable-the-freelist.patch b/patches/openssl-1.0.2b/0011-Disable-the-freelist.patch new file mode 100644 index 000000000..2cefe1352 --- /dev/null +++ b/patches/openssl-1.0.2b/0011-Disable-the-freelist.patch @@ -0,0 +1,42 @@ +From: Kurt Roeckx <kurt@roeckx.be> +Date: Fri, 12 Jun 2015 10:34:14 +0200 +Subject: [PATCH] Disable the freelist + +We don't define OPENSSL_NO_BUF_FREELISTS globally sinc it changes structures and +would break the ABI. Instead we just do it in the .c files that try to do +something with it. + + +Imported from openssl_1.0.2b-1.debian.tar.xz + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + ssl/s3_both.c | 1 + + ssl/ssl_lib.c | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/ssl/s3_both.c b/ssl/s3_both.c +index 019e21cd0274..a48d143c6e3b 100644 +--- a/ssl/s3_both.c ++++ b/ssl/s3_both.c +@@ -573,6 +573,7 @@ int ssl_verify_alarm_type(long type) + return (al); + } + ++#define OPENSSL_NO_BUF_FREELISTS + #ifndef OPENSSL_NO_BUF_FREELISTS + /*- + * On some platforms, malloc() performance is bad enough that you can't just +diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c +index c0931e787728..c74985e27876 100644 +--- a/ssl/ssl_lib.c ++++ b/ssl/ssl_lib.c +@@ -162,6 +162,8 @@ + + const char *SSL_version_str = OPENSSL_VERSION_TEXT; + ++#define OPENSSL_NO_BUF_FREELISTS ++ + SSL3_ENC_METHOD ssl3_undef_enc_method = { + /* + * evil casts, but these functions are only called if there's a library diff --git a/patches/openssl-1.0.1m/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch b/patches/openssl-1.0.2b/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch index c335208b9..ad4853e0c 100644 --- a/patches/openssl-1.0.1m/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch +++ b/patches/openssl-1.0.2b/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch @@ -8,11 +8,11 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configure b/Configure -index ae41bf75b03f..56c53ec80fbb 100755 +index 3f8c736f763a..c917081dfd9d 100755 --- a/Configure +++ b/Configure -@@ -106,7 +106,7 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta - my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED"; +@@ -125,7 +125,7 @@ my $clang_disabled_warnings = "-Wno-unused-parameter -Wno-missing-field-initiali + my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers -Wno-language-extension-token -Wno-extended-offsetof -Qunused-arguments"; # There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS -my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . `dpkg-buildflags --get LDFLAGS` . "-Wa,--noexecstack -Wall"; diff --git a/patches/openssl-1.0.1m/0101-fix-parallel-building.patch b/patches/openssl-1.0.2b/0101-fix-parallel-building.patch index bd00669af..d8e8ee35d 100644 --- a/patches/openssl-1.0.1m/0101-fix-parallel-building.patch +++ b/patches/openssl-1.0.2b/0101-fix-parallel-building.patch @@ -10,12 +10,12 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Makefile.org b/Makefile.org -index 5117a0ef9c0b..265ecd559e98 100644 +index f450f2b10b63..dc6345a54797 100644 --- a/Makefile.org +++ b/Makefile.org -@@ -272,18 +272,24 @@ build_all: build_libs build_apps build_tests build_tools - - build_libs: build_crypto build_ssl build_engines +@@ -276,18 +276,24 @@ build_libs: build_libcrypto build_libssl openssl.pc + build_libcrypto: build_crypto build_engines libcrypto.pc + build_libssl: build_ssl libssl.pc +ifeq ($(SHARED_LIBS),) +build_ssl: build_engines @@ -50,7 +50,7 @@ index 5117a0ef9c0b..265ecd559e98 100644 all_testapps: build_libs build_testapps build_testapps: diff --git a/crypto/Makefile b/crypto/Makefile -index 2355661f40fa..04029f8621fe 100644 +index 7869996a9c07..76690a1c8619 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -85,7 +85,7 @@ testapps: @@ -61,7 +61,7 @@ index 2355661f40fa..04029f8621fe 100644 + @+target=all; $(RECURSIVE_MAKE) files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO @@ -100,7 +100,7 @@ links: # lib: $(LIB): are splitted to avoid end-less loop lib: $(LIB) @@ -69,10 +69,10 @@ index 2355661f40fa..04029f8621fe 100644 -$(LIB): $(LIBOBJ) +$(LIB): $(LIBOBJ) subdirs $(AR) $(LIB) $(LIBOBJ) - [ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o + test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o $(RANLIB) $(LIB) || echo Never mind. diff --git a/engines/Makefile b/engines/Makefile -index 58e028131786..39f55ec6b345 100644 +index 315ef1ef780d..e7bc9758996c 100644 --- a/engines/Makefile +++ b/engines/Makefile @@ -72,7 +72,7 @@ top: diff --git a/patches/openssl-1.0.1m/series b/patches/openssl-1.0.2b/series index 24d5c870f..e3647eded 100644 --- a/patches/openssl-1.0.1m/series +++ b/patches/openssl-1.0.2b/series @@ -8,13 +8,11 @@ 0005-no-symbolic.patch 0006-pic.patch 0007-valgrind.patch -0008-rehash-crt.patch -0009-shared-lib-ext.patch -0010-block_diginotar.patch -0011-block_digicert_malaysia.patch -0012-Change-default-bit-size-and-digest.patch -0013-openssl_fix_for_x32.patch +0008-shared-lib-ext.patch +0009-block_diginotar.patch +0010-block_digicert_malaysia.patch +0011-Disable-the-freelist.patch #tag:ptx --start-number 100 0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch 0101-fix-parallel-building.patch -# 749da0b29e8f2a4388fdb7d89f64ef3a - git-ptx-patches magic +# 404effe638a1a2d67ac8974b9f2ea8b0 - git-ptx-patches magic diff --git a/rules/openssl.make b/rules/openssl.make index dc2136ef3..257f410f2 100644 --- a/rules/openssl.make +++ b/rules/openssl.make @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl # # Paths and names # -OPENSSL_VERSION := 1.0.1m -OPENSSL_MD5 := d143d1555d842a069cb7cc34ba745a06 +OPENSSL_VERSION := 1.0.2b +OPENSSL_MD5 := 7729b259e2dea7d60b32fc3934d6984b OPENSSL := openssl-$(OPENSSL_VERSION) OPENSSL_SUFFIX := tar.gz OPENSSL_URL := http://www.openssl.org/source/$(OPENSSL).$(OPENSSL_SUFFIX) |