From 917e3837a8f2aac6ee7afaa3e6dd8aaa29d62c49 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Wed, 23 Dec 2015 19:34:05 +0100 Subject: [PATCH] Updated OpenSSL 1.0.1 patch --- ...nssl-1.0.1l-patch => openssl-1.0.1q-patch} | 277 +++++++++++------- 1 file changed, 177 insertions(+), 100 deletions(-) rename bin/pkcs11/{openssl-1.0.1l-patch => openssl-1.0.1q-patch} (97%) diff --git a/bin/pkcs11/openssl-1.0.1l-patch b/bin/pkcs11/openssl-1.0.1q-patch similarity index 97% rename from bin/pkcs11/openssl-1.0.1l-patch rename to bin/pkcs11/openssl-1.0.1q-patch index 11c0885c25..c7772d2116 100644 --- a/bin/pkcs11/openssl-1.0.1l-patch +++ b/bin/pkcs11/openssl-1.0.1q-patch @@ -1,7 +1,7 @@ Index: openssl/Configure -diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1.2.1 openssl/Configure:1.17 ---- openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1.2.1 Wed Mar 4 14:09:36 2015 -+++ openssl/Configure Wed Mar 4 14:12:00 2015 +diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1.2.1.4.1 openssl/Configure:1.18 +--- openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1.2.1.4.1 Wed Dec 23 18:08:37 2015 ++++ openssl/Configure Wed Dec 23 18:26:43 2015 @@ -10,7 +10,7 @@ # see INSTALL for instructions. @@ -24,25 +24,45 @@ diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1.2.1 openssl/Configure: # --with-krb5-dir Declare where Kerberos 5 lives. The libraries are expected # to live in the subdirectory lib/ and the header files in # include/. A value is required. -@@ -352,7 +358,7 @@ - "linux-armv4", "gcc:-DTERMIO -O3 -Wall::-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)", - #### IA-32 targets... - "linux-ia32-icc", "icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT -pthread::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out", +@@ -348,24 +354,23 @@ #### - "linux-generic64","gcc:-DTERMIO -O3 -Wall::-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)", -@@ -360,7 +366,7 @@ - "linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-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):::64", + # *-generic* is endian-neutral target, but ./config is free to + # throw in -D[BL]_ENDIAN, whichever appropriate... +-"linux-generic32","gcc:-O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"linux-ppc", "gcc:-DB_ENDIAN -O3 -Wall::-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)", ++"linux-generic32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-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)", + # It's believed that majority of ARM toolchains predefine appropriate -march. + # If you compiler does not, do complement config command line with one! +-"linux-armv4", "gcc:-O3 -Wall::-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)", ++"linux-armv4", "gcc:-DTERMIO -O3 -Wall::-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)", + #### IA-32 targets... +-"linux-ia32-icc", "icc:-DL_ENDIAN -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"linux-elf", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"linux-aout", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out", ++"linux-ia32-icc", "icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT -pthread::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out", + #### +-"linux-generic64","gcc:-O3 -Wall::-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)", +-"linux-ppc64", "gcc:-m64 -DB_ENDIAN -O3 -Wall::-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):::64", +-"linux-ia64", "gcc:-DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"linux-ia64-ecc","ecc:-DL_ENDIAN -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"linux-ia64-icc","icc:-DL_ENDIAN -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"linux-x86_64", "gcc:-m64 -DL_ENDIAN -O3 -Wall::-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):::64", +-"linux-x86_64-clang","clang: -m64 -DL_ENDIAN -O3 -Wall -Qunused-arguments::-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):::64", +-"linux64-s390x", "gcc:-m64 -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", ++"linux-generic64","gcc:-DTERMIO -O3 -Wall::-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)", ++"linux-ppc64", "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-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):::64", ++"linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT -pthread::-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):::64", - "linux64-s390x", "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", ++"linux64-s390x", "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", #### So called "highgprs" target for z/Architecture CPUs # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see -@@ -657,6 +663,10 @@ + # /proc/cpuinfo. The idea is to preserve most significant bits of +@@ -661,6 +666,10 @@ my $idx_arflags = $idx++; my $idx_multilib = $idx++; @@ -53,7 +73,7 @@ diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1.2.1 openssl/Configure: my $prefix=""; my $libdir=""; my $openssldir=""; -@@ -882,6 +892,14 @@ +@@ -886,6 +895,14 @@ $_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei; $flags.=$_." "; } @@ -68,7 +88,7 @@ diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1.2.1 openssl/Configure: elsif (/^--prefix=(.*)$/) { $prefix=$1; -@@ -1049,6 +1067,22 @@ +@@ -1053,6 +1070,22 @@ exit 0; } @@ -91,7 +111,7 @@ diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1.2.1 openssl/Configure: if ($target =~ m/^CygWin32(-.*)$/) { $target = "Cygwin".$1; } -@@ -1126,6 +1160,25 @@ +@@ -1130,6 +1163,25 @@ $exp_cflags .= " -DOPENSSL_EXPERIMENTAL_$ALGO"; } @@ -117,7 +137,7 @@ diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1.2.1 openssl/Configure: my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); -@@ -1215,6 +1268,8 @@ +@@ -1219,6 +1271,8 @@ if ($flags ne "") { $cflags="$flags$cflags"; } else { $no_user_cflags=1; } @@ -126,7 +146,7 @@ diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1.2.1 openssl/Configure: # Kerberos settings. The flavor must be provided from outside, either through # the script "config" or manually. if (!$no_krb5) -@@ -1604,6 +1659,7 @@ +@@ -1617,6 +1671,7 @@ s/^VERSION=.*/VERSION=$version/; s/^MAJOR=.*/MAJOR=$major/; s/^MINOR=.*/MINOR=$minor/; @@ -135,9 +155,9 @@ diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1.2.1 openssl/Configure: s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/; s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/; Index: openssl/Makefile.org -diff -u openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1.2.1.2.1 openssl/Makefile.org:1.10 ---- openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1.2.1.2.1 Mon Apr 14 12:42:45 2014 -+++ openssl/Makefile.org Mon Apr 14 12:44:20 2014 +diff -u openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1.2.1.2.1.10.1 openssl/Makefile.org:1.11 +--- openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1.2.1.2.1.10.1 Wed Dec 23 18:08:37 2015 ++++ openssl/Makefile.org Wed Dec 23 18:26:43 2015 @@ -26,6 +26,9 @@ INSTALL_PREFIX= INSTALLTOP=/usr/local/ssl @@ -150,7 +170,7 @@ diff -u openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1.2.1.2.1 openssl/Makefile.org:1. Index: openssl/README.pkcs11 diff -u /dev/null openssl/README.pkcs11:1.8 ---- /dev/null Wed Mar 4 14:12:35 2015 +--- /dev/null Wed Dec 23 18:31:28 2015 +++ openssl/README.pkcs11 Fri Oct 4 14:16:43 2013 @@ -0,0 +1,266 @@ +ISC modified @@ -420,9 +440,9 @@ diff -u /dev/null openssl/README.pkcs11:1.8 +Latest version should be always available on http://blogs.sun.com/janp. + Index: openssl/crypto/opensslconf.h -diff -u openssl/crypto/opensslconf.h:1.6.2.1.4.1.10.1 openssl/crypto/opensslconf.h:1.8 ---- openssl/crypto/opensslconf.h:1.6.2.1.4.1.10.1 Fri Jan 2 14:55:34 2015 -+++ openssl/crypto/opensslconf.h Fri Jan 2 14:56:43 2015 +diff -u openssl/crypto/opensslconf.h:1.6.2.1.4.1.10.1.6.1 openssl/crypto/opensslconf.h:1.9 +--- openssl/crypto/opensslconf.h:1.6.2.1.4.1.10.1.6.1 Wed Dec 23 18:08:48 2015 ++++ openssl/crypto/opensslconf.h Wed Dec 23 18:26:49 2015 @@ -41,6 +41,9 @@ #endif /* OPENSSL_DOING_MAKEDEPEND */ @@ -490,23 +510,10 @@ diff -u openssl/crypto/opensslconf.h:1.6.2.1.4.1.10.1 openssl/crypto/opensslconf #endif /* These default values were supplied by -Index: openssl/crypto/bio/bss_file.c -diff -u openssl/crypto/bio/bss_file.c:1.6.2.1 openssl/crypto/bio/bss_file.c:1.6 ---- openssl/crypto/bio/bss_file.c:1.6.2.1 Sun Jan 15 16:09:44 2012 -+++ openssl/crypto/bio/bss_file.c Mon Jun 13 17:13:31 2011 -@@ -168,7 +168,7 @@ - { - SYSerr(SYS_F_FOPEN,get_last_sys_error()); - ERR_add_error_data(5,"fopen('",filename,"','",mode,"')"); -- if (errno == ENOENT) -+ if ((errno == ENOENT) || ((*mode == 'r') && (errno == EACCES))) - BIOerr(BIO_F_BIO_NEW_FILE,BIO_R_NO_SUCH_FILE); - else - BIOerr(BIO_F_BIO_NEW_FILE,ERR_R_SYS_LIB); Index: openssl/crypto/engine/Makefile -diff -u openssl/crypto/engine/Makefile:1.8.2.1.4.1 openssl/crypto/engine/Makefile:1.9 ---- openssl/crypto/engine/Makefile:1.8.2.1.4.1 Tue Jun 19 15:30:00 2012 -+++ openssl/crypto/engine/Makefile Tue Jun 19 16:18:00 2012 +diff -u openssl/crypto/engine/Makefile:1.8.2.1.4.1.16.1 openssl/crypto/engine/Makefile:1.10 +--- openssl/crypto/engine/Makefile:1.8.2.1.4.1.16.1 Wed Dec 23 18:09:29 2015 ++++ openssl/crypto/engine/Makefile Wed Dec 23 18:27:10 2015 @@ -22,13 +22,15 @@ tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \ tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c \ @@ -525,7 +532,7 @@ diff -u openssl/crypto/engine/Makefile:1.8.2.1.4.1 openssl/crypto/engine/Makefil SRC= $(LIBSRC) -@@ -294,6 +296,83 @@ +@@ -296,6 +298,83 @@ eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h eng_table.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h eng_table.o: eng_table.c @@ -611,7 +618,7 @@ diff -u openssl/crypto/engine/Makefile:1.8.2.1.4.1 openssl/crypto/engine/Makefil tb_asnmth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h Index: openssl/crypto/engine/cryptoki.h diff -u /dev/null openssl/crypto/engine/cryptoki.h:1.4 ---- /dev/null Wed Mar 4 14:12:35 2015 +--- /dev/null Wed Dec 23 18:31:29 2015 +++ openssl/crypto/engine/cryptoki.h Thu Dec 18 00:14:12 2008 @@ -0,0 +1,103 @@ +/* @@ -718,44 +725,44 @@ diff -u /dev/null openssl/crypto/engine/cryptoki.h:1.4 + +#endif /* _CRYPTOKI_H */ Index: openssl/crypto/engine/eng_all.c -diff -u openssl/crypto/engine/eng_all.c:1.5.2.1.4.1 openssl/crypto/engine/eng_all.c:1.6 ---- openssl/crypto/engine/eng_all.c:1.5.2.1.4.1 Tue Jun 19 15:30:00 2012 -+++ openssl/crypto/engine/eng_all.c Tue Jun 19 16:18:00 2012 -@@ -119,6 +119,14 @@ - #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) - ENGINE_load_capi(); +diff -u openssl/crypto/engine/eng_all.c:1.5.2.1.4.1.16.1 openssl/crypto/engine/eng_all.c:1.7 +--- openssl/crypto/engine/eng_all.c:1.5.2.1.4.1.16.1 Wed Dec 23 18:09:29 2015 ++++ openssl/crypto/engine/eng_all.c Wed Dec 23 18:27:10 2015 +@@ -122,6 +122,14 @@ + # if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) + ENGINE_load_capi(); + # endif ++# ifndef OPENSSL_NO_HW_PKCS11 ++# ifndef OPENSSL_NO_HW_PKCS11CA ++ ENGINE_load_pk11ca(); ++# endif ++# ifndef OPENSSL_NO_HW_PKCS11SO ++ ENGINE_load_pk11so(); ++# endif ++# endif #endif -+#ifndef OPENSSL_NO_HW_PKCS11 -+#ifndef OPENSSL_NO_HW_PKCS11CA -+ ENGINE_load_pk11ca(); -+#endif -+#ifndef OPENSSL_NO_HW_PKCS11SO -+ ENGINE_load_pk11so(); -+#endif -+#endif - #endif - ENGINE_register_all_complete(); - } + ENGINE_register_all_complete(); + } Index: openssl/crypto/engine/engine.h -diff -u openssl/crypto/engine/engine.h:1.5.2.1.4.1 openssl/crypto/engine/engine.h:1.6 ---- openssl/crypto/engine/engine.h:1.5.2.1.4.1 Tue Jun 19 15:30:00 2012 -+++ openssl/crypto/engine/engine.h Tue Jun 19 16:18:00 2012 -@@ -343,6 +343,12 @@ - void ENGINE_load_ubsec(void); - void ENGINE_load_padlock(void); - void ENGINE_load_capi(void); -+#ifndef OPENSSL_NO_HW_PKCS11CA +diff -u openssl/crypto/engine/engine.h:1.5.2.1.4.1.16.1 openssl/crypto/engine/engine.h:1.7 +--- openssl/crypto/engine/engine.h:1.5.2.1.4.1.16.1 Wed Dec 23 18:09:30 2015 ++++ openssl/crypto/engine/engine.h Wed Dec 23 18:27:11 2015 +@@ -416,6 +416,12 @@ + void ENGINE_load_rsax(void); + void ENGINE_load_rdrand(void); + void ENGINE_load_builtin_engines(void); ++# ifndef OPENSSL_NO_HW_PKCS11CA +void ENGINE_load_pk11ca(void); -+#endif -+#ifndef OPENSSL_NO_HW_PKCS11SO ++# endif ++# ifndef OPENSSL_NO_HW_PKCS11SO +void ENGINE_load_pk11so(void); -+#endif - #ifndef OPENSSL_NO_GMP - void ENGINE_load_gmp(void); - #endif ++# endif + + /* + * Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation Index: openssl/crypto/engine/hw_pk11.c diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.33 ---- /dev/null Wed Mar 4 14:12:35 2015 +--- /dev/null Wed Dec 23 18:31:29 2015 +++ openssl/crypto/engine/hw_pk11.c Fri Oct 4 14:07:41 2013 @@ -0,0 +1,4010 @@ +/* @@ -4770,7 +4777,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.33 +#endif /* OPENSSL_NO_HW */ Index: openssl/crypto/engine/hw_pk11_err.c diff -u /dev/null openssl/crypto/engine/hw_pk11_err.c:1.5 ---- /dev/null Wed Mar 4 14:12:35 2015 +--- /dev/null Wed Dec 23 18:31:29 2015 +++ openssl/crypto/engine/hw_pk11_err.c Tue Jun 14 00:43:26 2011 @@ -0,0 +1,288 @@ +/* @@ -5063,7 +5070,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.c:1.5 +} Index: openssl/crypto/engine/hw_pk11_err.h diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.13 ---- /dev/null Wed Mar 4 14:12:35 2015 +--- /dev/null Wed Dec 23 18:31:29 2015 +++ openssl/crypto/engine/hw_pk11_err.h Fri Oct 4 14:04:20 2013 @@ -0,0 +1,440 @@ +/* @@ -5508,7 +5515,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.13 +#endif /* HW_PK11_ERR_H */ Index: openssl/crypto/engine/hw_pk11_pub.c diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.42 ---- /dev/null Wed Mar 4 14:12:35 2015 +--- /dev/null Wed Dec 23 18:31:29 2015 +++ openssl/crypto/engine/hw_pk11_pub.c Fri Oct 4 14:27:06 2013 @@ -0,0 +1,3556 @@ +/* @@ -9069,7 +9076,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.42 +#endif /* OPENSSL_NO_HW */ Index: openssl/crypto/engine/hw_pk11ca.h diff -u /dev/null openssl/crypto/engine/hw_pk11ca.h:1.4 ---- /dev/null Wed Mar 4 14:12:35 2015 +--- /dev/null Wed Dec 23 18:31:29 2015 +++ openssl/crypto/engine/hw_pk11ca.h Wed Jun 15 21:12:20 2011 @@ -0,0 +1,32 @@ +/* Redefine all pk11/PK11 external symbols to pk11ca/PK11CA */ @@ -9106,7 +9113,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11ca.h:1.4 +#define ENGINE_load_pk11 ENGINE_load_pk11ca Index: openssl/crypto/engine/hw_pk11so.c diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.8 ---- /dev/null Wed Mar 4 14:12:35 2015 +--- /dev/null Wed Dec 23 18:31:29 2015 +++ openssl/crypto/engine/hw_pk11so.c Fri Oct 4 14:05:16 2013 @@ -0,0 +1,1775 @@ +/* @@ -10886,7 +10893,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.8 +#endif /* OPENSSL_NO_HW */ Index: openssl/crypto/engine/hw_pk11so.h diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.4 ---- /dev/null Wed Mar 4 14:12:35 2015 +--- /dev/null Wed Dec 23 18:31:29 2015 +++ openssl/crypto/engine/hw_pk11so.h Wed Jun 15 21:12:20 2011 @@ -0,0 +1,32 @@ +/* Redefine all pk11/PK11 external symbols to pk11so/PK11SO */ @@ -10923,7 +10930,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.4 +#define ENGINE_load_pk11 ENGINE_load_pk11so Index: openssl/crypto/engine/hw_pk11so_pub.c diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.10 ---- /dev/null Wed Mar 4 14:12:35 2015 +--- /dev/null Wed Dec 23 18:31:29 2015 +++ openssl/crypto/engine/hw_pk11so_pub.c Fri Oct 4 14:05:38 2013 @@ -0,0 +1,1642 @@ +/* @@ -12570,7 +12577,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.10 +#endif /* OPENSSL_NO_HW */ Index: openssl/crypto/engine/pkcs11.h diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1 ---- /dev/null Wed Mar 4 14:12:36 2015 +--- /dev/null Wed Dec 23 18:31:29 2015 +++ openssl/crypto/engine/pkcs11.h Wed Oct 24 23:27:09 2007 @@ -0,0 +1,299 @@ +/* pkcs11.h include file for PKCS #11. */ @@ -12874,7 +12881,7 @@ diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1 +#endif Index: openssl/crypto/engine/pkcs11f.h diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1 ---- /dev/null Wed Mar 4 14:12:36 2015 +--- /dev/null Wed Dec 23 18:31:29 2015 +++ openssl/crypto/engine/pkcs11f.h Wed Oct 24 23:27:09 2007 @@ -0,0 +1,912 @@ +/* pkcs11f.h include file for PKCS #11. */ @@ -13791,7 +13798,7 @@ diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1 +#endif Index: openssl/crypto/engine/pkcs11t.h diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2 ---- /dev/null Wed Mar 4 14:12:36 2015 +--- /dev/null Wed Dec 23 18:31:29 2015 +++ openssl/crypto/engine/pkcs11t.h Sat Aug 30 11:58:07 2008 @@ -0,0 +1,1885 @@ +/* pkcs11t.h include file for PKCS #11. */ @@ -15679,20 +15686,90 @@ diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2 +typedef CK_ARIA_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_ARIA_CBC_ENCRYPT_DATA_PARAMS_PTR; + +#endif +Index: openssl/demos/easy_tls/easy-tls.c +diff -u openssl/demos/easy_tls/easy-tls.c:1.1.1.1.76.1 openssl/demos/easy_tls/easy-tls.c:1.2 +--- openssl/demos/easy_tls/easy-tls.c:1.1.1.1.76.1 Wed Dec 23 18:10:12 2015 ++++ openssl/demos/easy_tls/easy-tls.c Wed Dec 23 18:27:33 2015 +@@ -1,7 +1,7 @@ + /* -*- Mode: C; c-file-style: "bsd" -*- */ + /*- + * easy-tls.c -- generic TLS proxy. +- * $Id: easy-tls.c,v 1.1.1.1.76.1 2015-12-23 18:10:12 fdupont Exp $ ++ * $Id: easy-tls.c,v 1.2 2015-12-23 18:27:33 fdupont Exp $ + */ + /*- + (c) Copyright 1999 Bodo Moeller. All rights reserved. +@@ -73,7 +73,7 @@ + */ + + static char const rcsid[] = +- "$Id: easy-tls.c,v 1.1.1.1.76.1 2015-12-23 18:10:12 fdupont Exp $"; ++ "$Id: easy-tls.c,v 1.2 2015-12-23 18:27:33 fdupont Exp $"; + + #include + #include +Index: openssl/demos/easy_tls/easy-tls.h +diff -u openssl/demos/easy_tls/easy-tls.h:1.1.1.1.76.1 openssl/demos/easy_tls/easy-tls.h:1.2 +--- openssl/demos/easy_tls/easy-tls.h:1.1.1.1.76.1 Wed Dec 23 18:10:12 2015 ++++ openssl/demos/easy_tls/easy-tls.h Wed Dec 23 18:27:34 2015 +@@ -1,7 +1,7 @@ + /* -*- Mode: C; c-file-style: "bsd" -*- */ + /*- + * easy-tls.h -- generic TLS proxy. +- * $Id: easy-tls.h,v 1.1.1.1.76.1 2015-12-23 18:10:12 fdupont Exp $ ++ * $Id: easy-tls.h,v 1.2 2015-12-23 18:27:34 fdupont Exp $ + */ + /* + * (c) Copyright 1999 Bodo Moeller. All rights reserved. +Index: openssl/demos/easy_tls/test.c +diff -u openssl/demos/easy_tls/test.c:1.1.1.1.76.1 openssl/demos/easy_tls/test.c:1.2 +--- openssl/demos/easy_tls/test.c:1.1.1.1.76.1 Wed Dec 23 18:10:12 2015 ++++ openssl/demos/easy_tls/test.c Wed Dec 23 18:27:34 2015 +@@ -1,5 +1,5 @@ + /* test.c */ +-/* $Id: test.c,v 1.1.1.1.76.1 2015-12-23 18:10:12 fdupont Exp $ */ ++/* $Id: test.c,v 1.2 2015-12-23 18:27:34 fdupont Exp $ */ + + #define L_PORT 9999 + #define C_PORT 443 +Index: openssl/demos/easy_tls/test.h +diff -u openssl/demos/easy_tls/test.h:1.1.1.1.76.1 openssl/demos/easy_tls/test.h:1.2 +--- openssl/demos/easy_tls/test.h:1.1.1.1.76.1 Wed Dec 23 18:10:12 2015 ++++ openssl/demos/easy_tls/test.h Wed Dec 23 18:27:34 2015 +@@ -1,5 +1,5 @@ + /* test.h */ +-/* $Id: test.h,v 1.1.1.1.76.1 2015-12-23 18:10:12 fdupont Exp $ */ ++/* $Id: test.h,v 1.2 2015-12-23 18:27:34 fdupont Exp $ */ + + void test_process_init(int fd, int client_p, void *apparg); + #define TLS_APP_PROCESS_INIT test_process_init +Index: openssl/engines/vendor_defns/hwcryptohook.h +diff -u openssl/engines/vendor_defns/hwcryptohook.h:1.1.1.1.76.1 openssl/engines/vendor_defns/hwcryptohook.h:1.2 +--- openssl/engines/vendor_defns/hwcryptohook.h:1.1.1.1.76.1 Wed Dec 23 18:10:24 2015 ++++ openssl/engines/vendor_defns/hwcryptohook.h Wed Dec 23 18:27:40 2015 +@@ -65,7 +65,7 @@ + * please contact nCipher. + * + * +- * $Id: hwcryptohook.h,v 1.1.1.1.76.1 2015-12-23 18:10:24 fdupont Exp $ ++ * $Id: hwcryptohook.h,v 1.2 2015-12-23 18:27:40 fdupont Exp $ + */ + + #ifndef HWCRYPTOHOOK_H Index: openssl/util/libeay.num -diff -u openssl/util/libeay.num:1.8.2.1.4.1.2.1.4.1.6.1 openssl/util/libeay.num:1.13 ---- openssl/util/libeay.num:1.8.2.1.4.1.2.1.4.1.6.1 Wed Mar 4 14:09:45 2015 -+++ openssl/util/libeay.num Wed Mar 4 14:12:05 2015 -@@ -4313,3 +4313,5 @@ +diff -u openssl/util/libeay.num:1.8.2.1.4.1.2.1.4.1.6.1.4.1 openssl/util/libeay.num:1.14 +--- openssl/util/libeay.num:1.8.2.1.4.1.2.1.4.1.6.1.4.1 Wed Dec 23 18:10:38 2015 ++++ openssl/util/libeay.num Wed Dec 23 18:27:48 2015 +@@ -4314,3 +4314,5 @@ BIO_s_datagram_sctp 4680 EXIST::FUNCTION:DGRAM,SCTP BIO_dgram_is_sctp 4681 EXIST::FUNCTION:SCTP BIO_dgram_sctp_notification_cb 4682 EXIST::FUNCTION:SCTP +ENGINE_load_pk11ca 4683 EXIST::FUNCTION:HW_PKCS11CA,ENGINE +ENGINE_load_pk11so 4683 EXIST::FUNCTION:HW_PKCS11SO,ENGINE Index: openssl/util/mk1mf.pl -diff -u openssl/util/mk1mf.pl:1.9.2.1.4.1.10.1.2.1 openssl/util/mk1mf.pl:1.12 ---- openssl/util/mk1mf.pl:1.9.2.1.4.1.10.1.2.1 Wed Mar 4 14:09:45 2015 -+++ openssl/util/mk1mf.pl Wed Mar 4 14:12:05 2015 +diff -u openssl/util/mk1mf.pl:1.9.2.1.4.1.10.1.2.1.4.1 openssl/util/mk1mf.pl:1.13 +--- openssl/util/mk1mf.pl:1.9.2.1.4.1.10.1.2.1.4.1 Wed Dec 23 18:10:38 2015 ++++ openssl/util/mk1mf.pl Wed Dec 23 18:27:48 2015 @@ -114,6 +114,8 @@ no-ecdh - No ECDH no-engine - No engine @@ -15770,9 +15847,9 @@ diff -u openssl/util/mkdef.pl:1.7.2.1.4.1.10.1.2.1 openssl/util/mkdef.pl:1.11 if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; } if ($keyword eq "GMP" && $no_gmp) { return 0; } Index: openssl/util/pl/VC-32.pl -diff -u openssl/util/pl/VC-32.pl:1.7.2.1.4.1.2.1.4.1 openssl/util/pl/VC-32.pl:1.10 ---- openssl/util/pl/VC-32.pl:1.7.2.1.4.1.2.1.4.1 Mon Apr 14 12:42:50 2014 -+++ openssl/util/pl/VC-32.pl Mon Apr 14 12:44:22 2014 +diff -u openssl/util/pl/VC-32.pl:1.7.2.1.4.1.2.1.4.1.10.1 openssl/util/pl/VC-32.pl:1.11 +--- openssl/util/pl/VC-32.pl:1.7.2.1.4.1.2.1.4.1.10.1 Wed Dec 23 18:10:39 2015 ++++ openssl/util/pl/VC-32.pl Wed Dec 23 18:27:48 2015 @@ -48,7 +48,7 @@ my $f = $shlib || $fips ?' /MD':' /MT'; $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib