From: Francis Dupont Date: Mon, 13 Jun 2016 16:05:33 +0000 (+0200) Subject: Updated OpenSSL patches for 1.0.[12] (active/supported) X-Git-Tag: v9.11.0b1~63 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=985d2d1b71173cbc2f859d963996a2e4b9248cc5;p=thirdparty%2Fbind9.git Updated OpenSSL patches for 1.0.[12] (active/supported) --- diff --git a/bin/pkcs11/openssl-1.0.1q-patch b/bin/pkcs11/openssl-1.0.1t-patch similarity index 99% rename from bin/pkcs11/openssl-1.0.1q-patch rename to bin/pkcs11/openssl-1.0.1t-patch index 7852392345b..dfc262826c7 100644 --- a/bin/pkcs11/openssl-1.0.1q-patch +++ b/bin/pkcs11/openssl-1.0.1t-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.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 +diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1.2.1.4.1.2.1 openssl/Configure:1.19 +--- openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1.2.1.4.1.2.1 Mon Jun 13 15:10:46 2016 ++++ openssl/Configure Mon Jun 13 15:20:23 2016 @@ -10,7 +10,7 @@ # see INSTALL for instructions. @@ -24,7 +24,7 @@ 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/Config # --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. -@@ -348,24 +354,23 @@ +@@ -355,24 +361,23 @@ #### # *-generic* is endian-neutral target, but ./config is free to # throw in -D[BL]_ENDIAN, whichever appropriate... @@ -62,7 +62,7 @@ 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/Config #### So called "highgprs" target for z/Architecture CPUs # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see # /proc/cpuinfo. The idea is to preserve most significant bits of -@@ -661,6 +666,10 @@ +@@ -668,6 +673,10 @@ my $idx_arflags = $idx++; my $idx_multilib = $idx++; @@ -73,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.4.1 openssl/Config my $prefix=""; my $libdir=""; my $openssldir=""; -@@ -886,6 +895,14 @@ +@@ -895,6 +904,14 @@ $_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei; $flags.=$_." "; } @@ -88,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.4.1 openssl/Config elsif (/^--prefix=(.*)$/) { $prefix=$1; -@@ -1053,6 +1070,22 @@ +@@ -1062,6 +1079,22 @@ exit 0; } @@ -111,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.4.1 openssl/Config if ($target =~ m/^CygWin32(-.*)$/) { $target = "Cygwin".$1; } -@@ -1130,6 +1163,25 @@ +@@ -1139,6 +1172,25 @@ $exp_cflags .= " -DOPENSSL_EXPERIMENTAL_$ALGO"; } @@ -137,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.4.1 openssl/Config my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); -@@ -1219,6 +1271,8 @@ +@@ -1228,6 +1280,8 @@ if ($flags ne "") { $cflags="$flags$cflags"; } else { $no_user_cflags=1; } @@ -146,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.4.1 openssl/Config # Kerberos settings. The flavor must be provided from outside, either through # the script "config" or manually. if (!$no_krb5) -@@ -1617,6 +1671,7 @@ +@@ -1626,6 +1680,7 @@ s/^VERSION=.*/VERSION=$version/; s/^MAJOR=.*/MAJOR=$major/; s/^MINOR=.*/MINOR=$minor/; @@ -155,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.4.1 openssl/Config 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.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 +diff -u openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1.2.1.2.1.10.1.2.1 openssl/Makefile.org:1.12 +--- openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1.2.1.2.1.10.1.2.1 Mon Jun 13 15:10:47 2016 ++++ openssl/Makefile.org Mon Jun 13 15:20:23 2016 @@ -26,6 +26,9 @@ INSTALL_PREFIX= INSTALLTOP=/usr/local/ssl @@ -170,7 +170,7 @@ diff -u openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1.2.1.2.1.10.1 openssl/Makefile.o Index: openssl/README.pkcs11 diff -u /dev/null openssl/README.pkcs11:1.8 ---- /dev/null Wed Dec 23 18:31:28 2015 +--- /dev/null Mon Jun 13 15:26:28 2016 +++ openssl/README.pkcs11 Fri Oct 4 14:16:43 2013 @@ -0,0 +1,266 @@ +ISC modified @@ -440,10 +440,10 @@ 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.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 @@ +diff -u openssl/crypto/opensslconf.h:1.6.2.1.4.1.10.1.6.1.2.1 openssl/crypto/opensslconf.h:1.10 +--- openssl/crypto/opensslconf.h:1.6.2.1.4.1.10.1.6.1.2.1 Mon Jun 13 15:10:49 2016 ++++ openssl/crypto/opensslconf.h Mon Jun 13 15:20:26 2016 +@@ -47,6 +47,9 @@ #endif /* OPENSSL_DOING_MAKEDEPEND */ @@ -453,7 +453,7 @@ diff -u openssl/crypto/opensslconf.h:1.6.2.1.4.1.10.1.6.1 openssl/crypto/openssl #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -@@ -82,6 +85,8 @@ +@@ -94,6 +97,8 @@ # endif #endif @@ -462,7 +462,7 @@ diff -u openssl/crypto/opensslconf.h:1.6.2.1.4.1.10.1.6.1 openssl/crypto/openssl /* crypto/opensslconf.h.in */ /* Generate 80386 code? */ -@@ -128,7 +133,7 @@ +@@ -140,7 +145,7 @@ * This enables code handling data aligned at natural CPU word * boundary. See crypto/rc4/rc4_enc.c for further details. */ @@ -471,7 +471,7 @@ diff -u openssl/crypto/opensslconf.h:1.6.2.1.4.1.10.1.6.1 openssl/crypto/openssl #endif #endif -@@ -136,7 +141,7 @@ +@@ -148,7 +153,7 @@ /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #ifndef DES_LONG @@ -480,7 +480,7 @@ diff -u openssl/crypto/opensslconf.h:1.6.2.1.4.1.10.1.6.1 openssl/crypto/openssl #endif #endif -@@ -147,9 +152,9 @@ +@@ -159,9 +164,9 @@ /* Should we define BN_DIV2W here? */ /* Only one for the following should be defined */ @@ -492,7 +492,7 @@ diff -u openssl/crypto/opensslconf.h:1.6.2.1.4.1.10.1.6.1 openssl/crypto/openssl #endif #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) -@@ -161,7 +166,7 @@ +@@ -173,7 +178,7 @@ #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) #define CONFIG_HEADER_BF_LOCL_H @@ -501,7 +501,7 @@ diff -u openssl/crypto/opensslconf.h:1.6.2.1.4.1.10.1.6.1 openssl/crypto/openssl #endif /* HEADER_BF_LOCL_H */ #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) -@@ -191,7 +196,7 @@ +@@ -203,7 +208,7 @@ /* Unroll the inner loop, this sometimes helps, sometimes hinders. * Very mucy CPU dependant */ #ifndef DES_UNROLL @@ -618,7 +618,7 @@ diff -u openssl/crypto/engine/Makefile:1.8.2.1.4.1.16.1 openssl/crypto/engine/Ma 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 Dec 23 18:31:29 2015 +--- /dev/null Mon Jun 13 15:26:29 2016 +++ openssl/crypto/engine/cryptoki.h Thu Dec 18 00:14:12 2008 @@ -0,0 +1,103 @@ +/* @@ -725,9 +725,9 @@ 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.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 +diff -u openssl/crypto/engine/eng_all.c:1.5.2.1.4.1.16.1.2.1 openssl/crypto/engine/eng_all.c:1.8 +--- openssl/crypto/engine/eng_all.c:1.5.2.1.4.1.16.1.2.1 Mon Jun 13 15:10:52 2016 ++++ openssl/crypto/engine/eng_all.c Mon Jun 13 15:20:31 2016 @@ -122,6 +122,14 @@ # if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) ENGINE_load_capi(); @@ -762,7 +762,7 @@ diff -u openssl/crypto/engine/engine.h:1.5.2.1.4.1.16.1 openssl/crypto/engine/en * 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 Dec 23 18:31:29 2015 +--- /dev/null Mon Jun 13 15:26:29 2016 +++ openssl/crypto/engine/hw_pk11.c Fri Oct 4 14:07:41 2013 @@ -0,0 +1,4010 @@ +/* @@ -4777,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 Dec 23 18:31:29 2015 +--- /dev/null Mon Jun 13 15:26:29 2016 +++ openssl/crypto/engine/hw_pk11_err.c Tue Jun 14 00:43:26 2011 @@ -0,0 +1,288 @@ +/* @@ -5070,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 Dec 23 18:31:29 2015 +--- /dev/null Mon Jun 13 15:26:29 2016 +++ openssl/crypto/engine/hw_pk11_err.h Fri Oct 4 14:04:20 2013 @@ -0,0 +1,440 @@ +/* @@ -5515,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 Dec 23 18:31:29 2015 +--- /dev/null Mon Jun 13 15:26:30 2016 +++ openssl/crypto/engine/hw_pk11_pub.c Fri Oct 4 14:27:06 2013 @@ -0,0 +1,3556 @@ +/* @@ -9076,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 Dec 23 18:31:29 2015 +--- /dev/null Mon Jun 13 15:26:30 2016 +++ 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 */ @@ -9113,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 Dec 23 18:31:29 2015 +--- /dev/null Mon Jun 13 15:26:30 2016 +++ openssl/crypto/engine/hw_pk11so.c Fri Oct 4 14:05:16 2013 @@ -0,0 +1,1775 @@ +/* @@ -10893,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 Dec 23 18:31:29 2015 +--- /dev/null Mon Jun 13 15:26:30 2016 +++ 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 */ @@ -10930,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 Dec 23 18:31:29 2015 +--- /dev/null Mon Jun 13 15:26:30 2016 +++ openssl/crypto/engine/hw_pk11so_pub.c Fri Oct 4 14:05:38 2013 @@ -0,0 +1,1642 @@ +/* @@ -12577,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 Dec 23 18:31:29 2015 +--- /dev/null Mon Jun 13 15:26:30 2016 +++ openssl/crypto/engine/pkcs11.h Wed Oct 24 23:27:09 2007 @@ -0,0 +1,299 @@ +/* pkcs11.h include file for PKCS #11. */ @@ -12881,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 Dec 23 18:31:29 2015 +--- /dev/null Mon Jun 13 15:26:30 2016 +++ openssl/crypto/engine/pkcs11f.h Wed Oct 24 23:27:09 2007 @@ -0,0 +1,912 @@ +/* pkcs11f.h include file for PKCS #11. */ @@ -13798,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 Dec 23 18:31:29 2015 +--- /dev/null Mon Jun 13 15:26:30 2016 +++ openssl/crypto/engine/pkcs11t.h Sat Aug 30 11:58:07 2008 @@ -0,0 +1,1885 @@ +/* pkcs11t.h include file for PKCS #11. */ @@ -15687,19 +15687,19 @@ diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2 + +#endif Index: openssl/util/libeay.num -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 @@ +diff -u openssl/util/libeay.num:1.8.2.1.4.1.2.1.4.1.6.1.4.1.2.1 openssl/util/libeay.num:1.15 +--- openssl/util/libeay.num:1.8.2.1.4.1.2.1.4.1.6.1.4.1.2.1 Mon Jun 13 15:11:04 2016 ++++ openssl/util/libeay.num Mon Jun 13 15:21:08 2016 +@@ -4316,3 +4316,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.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 +diff -u openssl/util/mk1mf.pl:1.9.2.1.4.1.10.1.2.1.4.1.2.1 openssl/util/mk1mf.pl:1.14 +--- openssl/util/mk1mf.pl:1.9.2.1.4.1.10.1.2.1.4.1.2.1 Mon Jun 13 15:11:05 2016 ++++ openssl/util/mk1mf.pl Mon Jun 13 15:21:08 2016 @@ -114,6 +114,8 @@ no-ecdh - No ECDH no-engine - No engine @@ -15718,7 +15718,7 @@ diff -u openssl/util/mk1mf.pl:1.9.2.1.4.1.10.1.2.1.4.1 openssl/util/mk1mf.pl:1.1 $cflags.=" -DOPENSSL_FIPS" if $fips; $cflags.=" -DOPENSSL_NO_JPAKE" if $no_jpake; $cflags.=" -DOPENSSL_NO_EC2M" if $no_ec2m; -@@ -345,6 +349,9 @@ +@@ -347,6 +351,9 @@ $dir=$val; } @@ -15728,7 +15728,7 @@ diff -u openssl/util/mk1mf.pl:1.9.2.1.4.1.10.1.2.1.4.1 openssl/util/mk1mf.pl:1.1 if ($key eq "KRB5_INCLUDES") { $cflags .= " $val";} -@@ -1131,6 +1138,8 @@ +@@ -1136,6 +1143,8 @@ "no-gost" => \$no_gost, "no-engine" => \$no_engine, "no-hw" => \$no_hw, @@ -15738,9 +15738,9 @@ diff -u openssl/util/mk1mf.pl:1.9.2.1.4.1.10.1.2.1.4.1 openssl/util/mk1mf.pl:1.1 "just-ssl" => [\$no_rc2, \$no_idea, \$no_des, \$no_bf, \$no_cast, Index: openssl/util/mkdef.pl -diff -u openssl/util/mkdef.pl:1.7.2.1.4.1.10.1.2.1 openssl/util/mkdef.pl:1.11 ---- openssl/util/mkdef.pl:1.7.2.1.4.1.10.1.2.1 Wed Mar 4 14:09:45 2015 -+++ openssl/util/mkdef.pl Wed Mar 4 14:12:05 2015 +diff -u openssl/util/mkdef.pl:1.7.2.1.4.1.10.1.2.1.6.1 openssl/util/mkdef.pl:1.12 +--- openssl/util/mkdef.pl:1.7.2.1.4.1.10.1.2.1.6.1 Mon Jun 13 15:11:05 2016 ++++ openssl/util/mkdef.pl Mon Jun 13 15:21:08 2016 @@ -96,7 +96,7 @@ # External "algorithms" "FP_API", "STDIO", "SOCK", "KRB5", "DGRAM", @@ -15750,7 +15750,7 @@ diff -u openssl/util/mkdef.pl:1.7.2.1.4.1.10.1.2.1 openssl/util/mkdef.pl:1.11 # RFC3779 "RFC3779", # TLS -@@ -139,6 +139,7 @@ +@@ -141,6 +141,7 @@ my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2; my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5; my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; @@ -15758,7 +15758,7 @@ diff -u openssl/util/mkdef.pl:1.7.2.1.4.1.10.1.2.1 openssl/util/mkdef.pl:1.11 my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated; my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng; my $no_jpake; my $no_srp; my $no_ssl2; my $no_ec2m; my $no_nistp_gcc; -@@ -245,6 +246,8 @@ +@@ -248,6 +249,8 @@ elsif (/^no-sctp$/) { $no_sctp=1; } elsif (/^no-srtp$/) { $no_srtp=1; } elsif (/^no-unit-test$/){ $no_unit_test=1; } @@ -15767,7 +15767,7 @@ diff -u openssl/util/mkdef.pl:1.7.2.1.4.1.10.1.2.1 openssl/util/mkdef.pl:1.11 } -@@ -1199,6 +1202,8 @@ +@@ -1202,6 +1205,8 @@ if ($keyword eq "KRB5" && $no_krb5) { return 0; } if ($keyword eq "ENGINE" && $no_engine) { return 0; } if ($keyword eq "HW" && $no_hw) { return 0; } @@ -15777,9 +15777,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.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 +diff -u openssl/util/pl/VC-32.pl:1.7.2.1.4.1.2.1.4.1.10.1.2.1 openssl/util/pl/VC-32.pl:1.12 +--- openssl/util/pl/VC-32.pl:1.7.2.1.4.1.2.1.4.1.10.1.2.1 Mon Jun 13 15:11:05 2016 ++++ openssl/util/pl/VC-32.pl Mon Jun 13 15:21:08 2016 @@ -48,7 +48,7 @@ my $f = $shlib || $fips ?' /MD':' /MT'; $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib diff --git a/bin/pkcs11/openssl-1.0.2f-patch b/bin/pkcs11/openssl-1.0.2h-patch similarity index 97% rename from bin/pkcs11/openssl-1.0.2f-patch rename to bin/pkcs11/openssl-1.0.2h-patch index 4a6b840fabb..f3a55fd07eb 100644 --- a/bin/pkcs11/openssl-1.0.2f-patch +++ b/bin/pkcs11/openssl-1.0.2h-patch @@ -1,14 +1,8 @@ -commit e17a25c1bc3a72e9649cb7561c803fe332acbca7 -Author: Evan Hunt -Date: Thu Jan 28 13:22:59 2016 -0800 - - updated - -diff --git a/Configure b/Configure -index 4a715dc..8d86ee1 100755 ---- a/Configure -+++ b/Configure -@@ -10,7 +10,7 @@ use strict; +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.2.1.2.1.2.1 openssl/Configure:1.17.2.3 +--- openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1.2.1.2.1.2.1.2.1 Mon Jun 13 15:41:03 2016 ++++ openssl/Configure Mon Jun 13 15:51:06 2016 +@@ -10,7 +10,7 @@ # see INSTALL for instructions. @@ -17,7 +11,7 @@ index 4a715dc..8d86ee1 100755 # Options: # -@@ -23,6 +23,12 @@ my $usage="Usage: Configure [no- ...] [enable- ...] [experimenta +@@ -23,6 +23,12 @@ # default). This needn't be set in advance, you can # just as well use "make INSTALL_PREFIX=/whatever install". # @@ -30,7 +24,7 @@ index 4a715dc..8d86ee1 100755 # --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. -@@ -398,31 +404,30 @@ my %table=( +@@ -402,31 +408,30 @@ # # ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8 # @@ -79,7 +73,7 @@ index 4a715dc..8d86ee1 100755 #### So called "highgprs" target for z/Architecture CPUs # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see # /proc/cpuinfo. The idea is to preserve most significant bits of -@@ -720,6 +725,10 @@ my $idx_ranlib = $idx++; +@@ -724,6 +729,10 @@ my $idx_arflags = $idx++; my $idx_multilib = $idx++; @@ -90,7 +84,7 @@ index 4a715dc..8d86ee1 100755 my $prefix=""; my $libdir=""; my $openssldir=""; -@@ -938,7 +947,15 @@ PROCESS_ARGS: +@@ -944,7 +953,15 @@ } elsif (/^[-+]/) { @@ -107,7 +101,7 @@ index 4a715dc..8d86ee1 100755 { $prefix=$1; } -@@ -1109,6 +1126,22 @@ if ($target eq "LIST") { +@@ -1115,6 +1132,22 @@ exit 0; } @@ -130,7 +124,7 @@ index 4a715dc..8d86ee1 100755 if ($target =~ m/^CygWin32(-.*)$/) { $target = "Cygwin".$1; } -@@ -1186,6 +1219,25 @@ foreach (sort @experimental) +@@ -1192,6 +1225,25 @@ $exp_cflags .= " -DOPENSSL_EXPERIMENTAL_$ALGO"; } @@ -156,7 +150,7 @@ index 4a715dc..8d86ee1 100755 my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); -@@ -1283,6 +1335,8 @@ my $no_user_cflags=0; +@@ -1289,6 +1341,8 @@ if ($flags ne "") { $cflags="$flags$cflags"; } else { $no_user_cflags=1; } @@ -165,7 +159,7 @@ index 4a715dc..8d86ee1 100755 # Kerberos settings. The flavor must be provided from outside, either through # the script "config" or manually. if (!$no_krb5) -@@ -1692,6 +1746,7 @@ while () +@@ -1698,6 +1752,7 @@ s/^VERSION=.*/VERSION=$version/; s/^MAJOR=.*/MAJOR=$major/; s/^MINOR=.*/MINOR=$minor/; @@ -173,11 +167,11 @@ index 4a715dc..8d86ee1 100755 s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=$shlib_version_number/; s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/; s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/; -diff --git a/Makefile.org b/Makefile.org -index 76fdbdf..178740c 100644 ---- a/Makefile.org -+++ b/Makefile.org -@@ -26,6 +26,9 @@ HERE=. +Index: openssl/Makefile.org +diff -u openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1.2.1.2.1.8.1.2.1.2.1 openssl/Makefile.org:1.10.2.3 +--- openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1.2.1.2.1.8.1.2.1.2.1 Mon Jun 13 15:41:03 2016 ++++ openssl/Makefile.org Mon Jun 13 15:51:08 2016 +@@ -26,6 +26,9 @@ INSTALL_PREFIX= INSTALLTOP=/usr/local/ssl @@ -187,11 +181,10 @@ index 76fdbdf..178740c 100644 # Do not edit this manually. Use Configure --openssldir=DIR do change this! OPENSSLDIR=/usr/local/ssl -diff --git a/README.pkcs11 b/README.pkcs11 -new file mode 100644 -index 0000000..aab67cb ---- /dev/null -+++ b/README.pkcs11 +Index: openssl/README.pkcs11 +diff -u /dev/null openssl/README.pkcs11:1.8 +--- /dev/null Mon Jun 13 15:55:24 2016 ++++ openssl/README.pkcs11 Fri Oct 4 14:16:43 2013 @@ -0,0 +1,266 @@ +ISC modified +============ @@ -459,138 +452,82 @@ index 0000000..aab67cb + +Latest version should be always available on http://blogs.sun.com/janp. + -diff --git a/apps/md4.c b/apps/md4.c -new file mode 100644 -index 0000000..c9fab66 ---- /dev/null -+++ b/apps/md4.c -@@ -0,0 +1,121 @@ -+/* crypto/md4/md4.c */ -+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) -+ * All rights reserved. -+ * -+ * This package is an SSL implementation written -+ * by Eric Young (eay@cryptsoft.com). -+ * The implementation was written so as to conform with Netscapes SSL. -+ * -+ * This library is free for commercial and non-commercial use as long as -+ * the following conditions are aheared to. The following conditions -+ * apply to all code found in this distribution, be it the RC4, RSA, -+ * lhash, DES, etc., code; not just the SSL code. The SSL documentation -+ * included with this distribution is covered by the same copyright terms -+ * except that the holder is Tim Hudson (tjh@cryptsoft.com). -+ * -+ * Copyright remains Eric Young's, and as such any Copyright notices in -+ * the code are not to be removed. -+ * If this package is used in a product, Eric Young should be given attribution -+ * as the author of the parts of the library used. -+ * This can be in the form of a textual message at program startup or -+ * in documentation (online or textual) provided with the package. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. All advertising materials mentioning features or use of this software -+ * must display the following acknowledgement: -+ * "This product includes cryptographic software written by -+ * Eric Young (eay@cryptsoft.com)" -+ * The word 'cryptographic' can be left out if the rouines from the library -+ * being used are not cryptographic related :-). -+ * 4. If you include any Windows specific code (or a derivative thereof) from -+ * the apps directory (application code) you must include an acknowledgement: -+ * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" -+ * -+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * -+ * The licence and distribution terms for any publically available version or -+ * derivative of this code cannot be changed. i.e. this code cannot simply be -+ * copied and put under another distribution licence -+ * [including the GNU Public Licence.] -+ */ -+ -+#include -+#include -+#include -+ -+#define BUFSIZE 1024*16 -+ -+void do_fp(FILE *f); -+void pt(unsigned char *md); -+#if !defined(_OSD_POSIX) && !defined(__DJGPP__) -+int read(int, void *, unsigned int); +Index: openssl/crypto/opensslconf.h +diff -u openssl/crypto/opensslconf.h:1.6.2.1.4.1.10.1.4.1.2.1.2.1 openssl/crypto/opensslconf.h:1.8.2.3 +--- openssl/crypto/opensslconf.h:1.6.2.1.4.1.10.1.4.1.2.1.2.1 Mon Jun 13 15:41:06 2016 ++++ openssl/crypto/opensslconf.h Mon Jun 13 15:51:23 2016 +@@ -53,6 +53,9 @@ + + #endif /* OPENSSL_DOING_MAKEDEPEND */ + ++#ifndef OPENSSL_THREADS ++# define OPENSSL_THREADS +#endif + #ifndef OPENSSL_NO_DYNAMIC_ENGINE + # define OPENSSL_NO_DYNAMIC_ENGINE + #endif +@@ -106,6 +109,8 @@ + # endif + #endif + ++#define OPENSSL_CPUID_OBJ + -+int main(int argc, char **argv) -+{ -+ int i, err = 0; -+ FILE *IN; -+ -+ if (argc == 1) { -+ do_fp(stdin); -+ } else { -+ for (i = 1; i < argc; i++) { -+ IN = fopen(argv[i], "r"); -+ if (IN == NULL) { -+ perror(argv[i]); -+ err++; -+ continue; -+ } -+ printf("MD4(%s)= ", argv[i]); -+ do_fp(IN); -+ fclose(IN); -+ } -+ } -+ exit(err); -+} -+ -+void do_fp(FILE *f) -+{ -+ MD4_CTX c; -+ unsigned char md[MD4_DIGEST_LENGTH]; -+ int fd; -+ int i; -+ static unsigned char buf[BUFSIZE]; -+ -+ fd = fileno(f); -+ MD4_Init(&c); -+ for (;;) { -+ i = read(fd, buf, sizeof buf); -+ if (i <= 0) -+ break; -+ MD4_Update(&c, buf, (unsigned long)i); -+ } -+ MD4_Final(&(md[0]), &c); -+ pt(md); -+} -+ -+void pt(unsigned char *md) -+{ -+ int i; -+ -+ for (i = 0; i < MD4_DIGEST_LENGTH; i++) -+ printf("%02x", md[i]); -+ printf("\n"); -+} -diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c -index bfba93e..fab03cb 100644 ---- a/crypto/bio/bss_file.c -+++ b/crypto/bio/bss_file.c -@@ -174,7 +174,7 @@ BIO *BIO_new_file(const char *filename, const char *mode) + /* crypto/opensslconf.h.in */ + + /* Generate 80386 code? */ +@@ -152,7 +157,7 @@ + * This enables code handling data aligned at natural CPU word + * boundary. See crypto/rc4/rc4_enc.c for further details. + */ +-#undef RC4_CHUNK ++#define RC4_CHUNK unsigned long + #endif + #endif + +@@ -160,7 +165,7 @@ + /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a + * %20 speed up (longs are 8 bytes, int's are 4). */ + #ifndef DES_LONG +-#define DES_LONG unsigned long ++#define DES_LONG unsigned int + #endif + #endif + +@@ -171,9 +176,9 @@ + /* Should we define BN_DIV2W here? */ + + /* Only one for the following should be defined */ +-#undef SIXTY_FOUR_BIT_LONG ++#define SIXTY_FOUR_BIT_LONG + #undef SIXTY_FOUR_BIT +-#define THIRTY_TWO_BIT ++#undef THIRTY_TWO_BIT + #endif + + #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) +@@ -185,7 +190,7 @@ + + #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) + #define CONFIG_HEADER_BF_LOCL_H +-#undef BF_PTR ++#define BF_PTR2 + #endif /* HEADER_BF_LOCL_H */ + + #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) +@@ -215,7 +220,7 @@ + /* Unroll the inner loop, this sometimes helps, sometimes hinders. + * Very mucy CPU dependant */ + #ifndef DES_UNROLL +-#undef DES_UNROLL ++#define DES_UNROLL + #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.28.1.2.1 openssl/crypto/bio/bss_file.c:1.6.10.2 +--- openssl/crypto/bio/bss_file.c:1.6.2.1.28.1.2.1 Wed Dec 23 18:55:13 2015 ++++ openssl/crypto/bio/bss_file.c Wed Dec 23 19:28:46 2015 +@@ -174,7 +174,7 @@ if (file == NULL) { SYSerr(SYS_F_FOPEN, get_last_sys_error()); ERR_add_error_data(5, "fopen('", filename, "','", mode, "')"); @@ -599,11 +536,11 @@ index bfba93e..fab03cb 100644 BIOerr(BIO_F_BIO_NEW_FILE, BIO_R_NO_SUCH_FILE); else BIOerr(BIO_F_BIO_NEW_FILE, ERR_R_SYS_LIB); -diff --git a/crypto/engine/Makefile b/crypto/engine/Makefile -index 426388e..c0d2291 100644 ---- a/crypto/engine/Makefile -+++ b/crypto/engine/Makefile -@@ -22,13 +22,15 @@ LIBSRC= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \ +Index: openssl/crypto/engine/Makefile +diff -u openssl/crypto/engine/Makefile:1.8.2.1.4.1.14.1.2.1 openssl/crypto/engine/Makefile:1.9.6.2 +--- openssl/crypto/engine/Makefile:1.8.2.1.4.1.14.1.2.1 Wed Dec 23 18:55:22 2015 ++++ openssl/crypto/engine/Makefile Wed Dec 23 19:28:56 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 \ eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \ @@ -621,7 +558,7 @@ index 426388e..c0d2291 100644 SRC= $(LIBSRC) -@@ -282,6 +284,83 @@ eng_table.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +@@ -282,6 +284,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 @@ -705,11 +642,10 @@ index 426388e..c0d2291 100644 tb_asnmth.o: ../../e_os.h ../../include/openssl/asn1.h tb_asnmth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h tb_asnmth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -diff --git a/crypto/engine/cryptoki.h b/crypto/engine/cryptoki.h -new file mode 100644 -index 0000000..367f839 ---- /dev/null -+++ b/crypto/engine/cryptoki.h +Index: openssl/crypto/engine/cryptoki.h +diff -u /dev/null openssl/crypto/engine/cryptoki.h:1.4 +--- /dev/null Mon Jun 13 15:55:25 2016 ++++ openssl/crypto/engine/cryptoki.h Thu Dec 18 00:14:12 2008 @@ -0,0 +1,103 @@ +/* + * CDDL HEADER START @@ -814,11 +750,11 @@ index 0000000..367f839 +#endif + +#endif /* _CRYPTOKI_H */ -diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c -index 48ad0d2..e56885f 100644 ---- a/crypto/engine/eng_all.c -+++ b/crypto/engine/eng_all.c -@@ -119,6 +119,14 @@ void ENGINE_load_builtin_engines(void) +Index: openssl/crypto/engine/eng_all.c +diff -u openssl/crypto/engine/eng_all.c:1.5.2.1.4.1.14.1.4.1 openssl/crypto/engine/eng_all.c:1.6.6.2 +--- openssl/crypto/engine/eng_all.c:1.5.2.1.4.1.14.1.4.1 Mon Jun 13 15:41:32 2016 ++++ openssl/crypto/engine/eng_all.c Mon Jun 13 15:51:59 2016 +@@ -119,6 +119,14 @@ # if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) ENGINE_load_capi(); # endif @@ -833,11 +769,11 @@ index 48ad0d2..e56885f 100644 #endif ENGINE_register_all_complete(); } -diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h -index bd7b591..fa8390e 100644 ---- a/crypto/engine/engine.h -+++ b/crypto/engine/engine.h -@@ -405,6 +405,12 @@ void ENGINE_load_sureware(void); +Index: openssl/crypto/engine/engine.h +diff -u openssl/crypto/engine/engine.h:1.5.2.1.4.1.14.1 openssl/crypto/engine/engine.h:1.6.6.1 +--- openssl/crypto/engine/engine.h:1.5.2.1.4.1.14.1 Wed Mar 4 14:43:55 2015 ++++ openssl/crypto/engine/engine.h Wed Mar 4 15:22:32 2015 +@@ -405,6 +405,12 @@ void ENGINE_load_ubsec(void); void ENGINE_load_padlock(void); void ENGINE_load_capi(void); @@ -850,11 +786,10 @@ index bd7b591..fa8390e 100644 # ifndef OPENSSL_NO_GMP void ENGINE_load_gmp(void); # endif -diff --git a/crypto/engine/hw_pk11.c b/crypto/engine/hw_pk11.c -new file mode 100644 -index 0000000..1c01582 ---- /dev/null -+++ b/crypto/engine/hw_pk11.c +Index: openssl/crypto/engine/hw_pk11.c +diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.33 +--- /dev/null Mon Jun 13 15:55:25 2016 ++++ openssl/crypto/engine/hw_pk11.c Fri Oct 4 14:07:41 2013 @@ -0,0 +1,4010 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. @@ -4866,11 +4801,10 @@ index 0000000..1c01582 +#endif /* OPENSSL_NO_HW_PK11CA */ +#endif /* OPENSSL_NO_HW_PK11 */ +#endif /* OPENSSL_NO_HW */ -diff --git a/crypto/engine/hw_pk11_err.c b/crypto/engine/hw_pk11_err.c -new file mode 100644 -index 0000000..fdbea45 ---- /dev/null -+++ b/crypto/engine/hw_pk11_err.c +Index: openssl/crypto/engine/hw_pk11_err.c +diff -u /dev/null openssl/crypto/engine/hw_pk11_err.c:1.5 +--- /dev/null Mon Jun 13 15:55:26 2016 ++++ openssl/crypto/engine/hw_pk11_err.c Tue Jun 14 00:43:26 2011 @@ -0,0 +1,288 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. @@ -5160,11 +5094,10 @@ index 0000000..fdbea45 + (void) BIO_snprintf(tmp_buf, sizeof (tmp_buf), "%lx", rv); + ERR_add_error_data(2, "PK11 CK_RV=0X", tmp_buf); +} -diff --git a/crypto/engine/hw_pk11_err.h b/crypto/engine/hw_pk11_err.h -new file mode 100644 -index 0000000..32b2213 ---- /dev/null -+++ b/crypto/engine/hw_pk11_err.h +Index: openssl/crypto/engine/hw_pk11_err.h +diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.13 +--- /dev/null Mon Jun 13 15:55:26 2016 ++++ openssl/crypto/engine/hw_pk11_err.h Fri Oct 4 14:04:20 2013 @@ -0,0 +1,440 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. @@ -5606,11 +5539,10 @@ index 0000000..32b2213 +extern CK_FUNCTION_LIST_PTR pFuncList; + +#endif /* HW_PK11_ERR_H */ -diff --git a/crypto/engine/hw_pk11_pub.c b/crypto/engine/hw_pk11_pub.c -new file mode 100644 -index 0000000..db2ac8d ---- /dev/null -+++ b/crypto/engine/hw_pk11_pub.c +Index: openssl/crypto/engine/hw_pk11_pub.c +diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.42 +--- /dev/null Mon Jun 13 15:55:26 2016 ++++ openssl/crypto/engine/hw_pk11_pub.c Fri Oct 4 14:27:06 2013 @@ -0,0 +1,3556 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. @@ -9168,11 +9100,10 @@ index 0000000..db2ac8d +#endif /* OPENSSL_NO_HW_PK11CA */ +#endif /* OPENSSL_NO_HW_PK11 */ +#endif /* OPENSSL_NO_HW */ -diff --git a/crypto/engine/hw_pk11ca.h b/crypto/engine/hw_pk11ca.h -new file mode 100644 -index 0000000..813b1ed ---- /dev/null -+++ b/crypto/engine/hw_pk11ca.h +Index: openssl/crypto/engine/hw_pk11ca.h +diff -u /dev/null openssl/crypto/engine/hw_pk11ca.h:1.4 +--- /dev/null Mon Jun 13 15:55:26 2016 ++++ 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 */ + @@ -9206,11 +9137,10 @@ index 0000000..813b1ed +#define pFuncList pk11ca_pFuncList +#define pk11_pin pk11ca_pin +#define ENGINE_load_pk11 ENGINE_load_pk11ca -diff --git a/crypto/engine/hw_pk11so.c b/crypto/engine/hw_pk11so.c -new file mode 100644 -index 0000000..a7b88a9 ---- /dev/null -+++ b/crypto/engine/hw_pk11so.c +Index: openssl/crypto/engine/hw_pk11so.c +diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.8 +--- /dev/null Mon Jun 13 15:55:26 2016 ++++ openssl/crypto/engine/hw_pk11so.c Fri Oct 4 14:05:16 2013 @@ -0,0 +1,1775 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. @@ -10987,11 +10917,10 @@ index 0000000..a7b88a9 +#endif /* OPENSSL_NO_HW_PK11SO */ +#endif /* OPENSSL_NO_HW_PK11 */ +#endif /* OPENSSL_NO_HW */ -diff --git a/crypto/engine/hw_pk11so.h b/crypto/engine/hw_pk11so.h -new file mode 100644 -index 0000000..5002935 ---- /dev/null -+++ b/crypto/engine/hw_pk11so.h +Index: openssl/crypto/engine/hw_pk11so.h +diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.4 +--- /dev/null Mon Jun 13 15:55:26 2016 ++++ 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 */ + @@ -11025,11 +10954,10 @@ index 0000000..5002935 +#define pFuncList pk11so_pFuncList +#define pk11_pin pk11so_pin +#define ENGINE_load_pk11 ENGINE_load_pk11so -diff --git a/crypto/engine/hw_pk11so_pub.c b/crypto/engine/hw_pk11so_pub.c -new file mode 100644 -index 0000000..03e3eee ---- /dev/null -+++ b/crypto/engine/hw_pk11so_pub.c +Index: openssl/crypto/engine/hw_pk11so_pub.c +diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.10 +--- /dev/null Mon Jun 13 15:55:26 2016 ++++ openssl/crypto/engine/hw_pk11so_pub.c Fri Oct 4 14:05:38 2013 @@ -0,0 +1,1642 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. @@ -12673,11 +12601,10 @@ index 0000000..03e3eee +#endif /* OPENSSL_NO_HW_PK11SO */ +#endif /* OPENSSL_NO_HW_PK11 */ +#endif /* OPENSSL_NO_HW */ -diff --git a/crypto/engine/pkcs11.h b/crypto/engine/pkcs11.h -new file mode 100644 -index 0000000..225ccae ---- /dev/null -+++ b/crypto/engine/pkcs11.h +Index: openssl/crypto/engine/pkcs11.h +diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1 +--- /dev/null Mon Jun 13 15:55:26 2016 ++++ openssl/crypto/engine/pkcs11.h Wed Oct 24 23:27:09 2007 @@ -0,0 +1,299 @@ +/* pkcs11.h include file for PKCS #11. */ +/* $Revision: 1.1.1.1 $ */ @@ -12978,11 +12905,10 @@ index 0000000..225ccae +#endif + +#endif -diff --git a/crypto/engine/pkcs11f.h b/crypto/engine/pkcs11f.h -new file mode 100644 -index 0000000..889e7b6 ---- /dev/null -+++ b/crypto/engine/pkcs11f.h +Index: openssl/crypto/engine/pkcs11f.h +diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1 +--- /dev/null Mon Jun 13 15:55:26 2016 ++++ openssl/crypto/engine/pkcs11f.h Wed Oct 24 23:27:09 2007 @@ -0,0 +1,912 @@ +/* pkcs11f.h include file for PKCS #11. */ +/* $Revision: 1.1.1.1 $ */ @@ -13896,11 +13822,10 @@ index 0000000..889e7b6 + CK_VOID_PTR pRserved /* reserved. Should be NULL_PTR */ +); +#endif -diff --git a/crypto/engine/pkcs11t.h b/crypto/engine/pkcs11t.h -new file mode 100644 -index 0000000..0430bc8 ---- /dev/null -+++ b/crypto/engine/pkcs11t.h +Index: openssl/crypto/engine/pkcs11t.h +diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2 +--- /dev/null Mon Jun 13 15:55:26 2016 ++++ openssl/crypto/engine/pkcs11t.h Sat Aug 30 11:58:07 2008 @@ -0,0 +1,1885 @@ +/* pkcs11t.h include file for PKCS #11. */ +/* $Revision: 1.2 $ */ @@ -15787,93 +15712,22 @@ index 0000000..0430bc8 +typedef CK_ARIA_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_ARIA_CBC_ENCRYPT_DATA_PARAMS_PTR; + +#endif -diff --git a/crypto/opensslconf.h b/crypto/opensslconf.h -index b4d522e..5bb616b 100644 ---- a/crypto/opensslconf.h -+++ b/crypto/opensslconf.h -@@ -47,6 +47,9 @@ extern "C" { - - #endif /* OPENSSL_DOING_MAKEDEPEND */ - -+#ifndef OPENSSL_THREADS -+# define OPENSSL_THREADS -+#endif - #ifndef OPENSSL_NO_DYNAMIC_ENGINE - # define OPENSSL_NO_DYNAMIC_ENGINE - #endif -@@ -94,6 +97,8 @@ extern "C" { - # endif - #endif - -+#define OPENSSL_CPUID_OBJ -+ - /* crypto/opensslconf.h.in */ - - /* Generate 80386 code? */ -@@ -140,7 +145,7 @@ extern "C" { - * This enables code handling data aligned at natural CPU word - * boundary. See crypto/rc4/rc4_enc.c for further details. - */ --#undef RC4_CHUNK -+#define RC4_CHUNK unsigned long - #endif - #endif - -@@ -148,7 +153,7 @@ extern "C" { - /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a - * %20 speed up (longs are 8 bytes, int's are 4). */ - #ifndef DES_LONG --#define DES_LONG unsigned long -+#define DES_LONG unsigned int - #endif - #endif - -@@ -159,9 +164,9 @@ extern "C" { - /* Should we define BN_DIV2W here? */ - - /* Only one for the following should be defined */ --#undef SIXTY_FOUR_BIT_LONG -+#define SIXTY_FOUR_BIT_LONG - #undef SIXTY_FOUR_BIT --#define THIRTY_TWO_BIT -+#undef THIRTY_TWO_BIT - #endif - - #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) -@@ -173,7 +178,7 @@ extern "C" { - - #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) - #define CONFIG_HEADER_BF_LOCL_H --#undef BF_PTR -+#define BF_PTR2 - #endif /* HEADER_BF_LOCL_H */ - - #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) -@@ -203,7 +208,7 @@ extern "C" { - /* Unroll the inner loop, this sometimes helps, sometimes hinders. - * Very mucy CPU dependant */ - #ifndef DES_UNROLL --#undef DES_UNROLL -+#define DES_UNROLL - #endif - - /* These default values were supplied by -diff --git a/util/libeay.num b/util/libeay.num -index 7f7487d..ecf09fe 100755 ---- a/util/libeay.num -+++ b/util/libeay.num -@@ -4413,4 +4413,5 @@ ECDSA_METHOD_get_app_data 4770 EXIST::FUNCTION:ECDSA +Index: openssl/util/libeay.num +diff -u openssl/util/libeay.num:1.8.2.1.4.1.2.1.4.1.6.1.2.1.2.1.2.1 openssl/util/libeay.num:1.13.2.3 +--- openssl/util/libeay.num:1.8.2.1.4.1.2.1.4.1.6.1.2.1.2.1.2.1 Mon Jun 13 15:42:32 2016 ++++ openssl/util/libeay.num Mon Jun 13 15:52:51 2016 +@@ -4415,4 +4415,5 @@ X509_VERIFY_PARAM_add1_host 4771 EXIST::FUNCTION: EC_GROUP_get_mont_data 4772 EXIST::FUNCTION:EC i2d_re_X509_tbs 4773 EXIST::FUNCTION: -EVP_PKEY_asn1_set_item 4774 EXIST::FUNCTION: +ENGINE_load_pk11ca 4774 EXIST::FUNCTION:HW_PKCS11CA,ENGINE +ENGINE_load_pk11so 4774 EXIST::FUNCTION:HW_PKCS11SO,ENGINE -diff --git a/util/mk1mf.pl b/util/mk1mf.pl -index 99652af..4c792d4 100755 ---- a/util/mk1mf.pl -+++ b/util/mk1mf.pl -@@ -122,6 +122,8 @@ and [options] can be one of +Index: openssl/util/mk1mf.pl +diff -u openssl/util/mk1mf.pl:1.9.2.1.4.1.10.1.2.1.2.1.2.1.2.1 openssl/util/mk1mf.pl:1.12.2.3 +--- openssl/util/mk1mf.pl:1.9.2.1.4.1.10.1.2.1.2.1.2.1.2.1 Mon Jun 13 15:42:33 2016 ++++ openssl/util/mk1mf.pl Mon Jun 13 15:52:52 2016 +@@ -122,6 +122,8 @@ no-ecdh - No ECDH no-engine - No engine no-hw - No hw @@ -15882,7 +15736,7 @@ index 99652af..4c792d4 100755 nasm - Use NASM for x86 asm nw-nasm - Use NASM x86 asm for NetWare nw-mwasm - Use Metrowerks x86 asm for NetWare -@@ -287,6 +289,8 @@ $cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh; +@@ -287,6 +289,8 @@ $cflags.=" -DOPENSSL_NO_GOST" if $no_gost; $cflags.=" -DOPENSSL_NO_ENGINE" if $no_engine; $cflags.=" -DOPENSSL_NO_HW" if $no_hw; @@ -15891,7 +15745,7 @@ index 99652af..4c792d4 100755 $cflags.=" -DOPENSSL_FIPS" if $fips; $cflags.=" -DOPENSSL_NO_JPAKE" if $no_jpake; $cflags.=" -DOPENSSL_NO_EC2M" if $no_ec2m; -@@ -359,6 +363,9 @@ for (;;) +@@ -361,6 +365,9 @@ $dir=$val; } @@ -15901,7 +15755,7 @@ index 99652af..4c792d4 100755 if ($key eq "KRB5_INCLUDES") { $cflags .= " $val";} -@@ -1214,6 +1221,8 @@ sub read_options +@@ -1219,6 +1226,8 @@ "no-gost" => \$no_gost, "no-engine" => \$no_engine, "no-hw" => \$no_hw, @@ -15910,11 +15764,11 @@ index 99652af..4c792d4 100755 "no-rsax" => 0, "just-ssl" => [\$no_rc2, \$no_idea, \$no_des, \$no_bf, \$no_cast, -diff --git a/util/mkdef.pl b/util/mkdef.pl -index c57c7f7..9eeafd9 100755 ---- a/util/mkdef.pl -+++ b/util/mkdef.pl -@@ -96,7 +96,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", +Index: openssl/util/mkdef.pl +diff -u openssl/util/mkdef.pl:1.7.2.1.4.1.10.1.2.1.2.1.4.1 openssl/util/mkdef.pl:1.11.2.2 +--- openssl/util/mkdef.pl:1.7.2.1.4.1.10.1.2.1.2.1.4.1 Mon Jun 13 15:42:34 2016 ++++ openssl/util/mkdef.pl Mon Jun 13 15:52:52 2016 +@@ -96,7 +96,7 @@ # External "algorithms" "FP_API", "STDIO", "SOCK", "KRB5", "DGRAM", # Engines @@ -15923,7 +15777,7 @@ index c57c7f7..9eeafd9 100755 # RFC3779 "RFC3779", # TLS -@@ -141,6 +141,7 @@ my $no_cast; my $no_whirlpool; my $no_camellia; my $no_seed; +@@ -143,6 +143,7 @@ my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2; my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5; my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; @@ -15931,7 +15785,7 @@ index c57c7f7..9eeafd9 100755 my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated; my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng; my $no_jpake; my $no_srp; my $no_ssl2; my $no_ec2m; my $no_nistp_gcc; -@@ -248,6 +249,8 @@ foreach (@ARGV, split(/ /, $options)) +@@ -251,6 +252,8 @@ elsif (/^no-sctp$/) { $no_sctp=1; } elsif (/^no-srtp$/) { $no_srtp=1; } elsif (/^no-unit-test$/){ $no_unit_test=1; } @@ -15940,7 +15794,7 @@ index c57c7f7..9eeafd9 100755 } -@@ -1203,6 +1206,8 @@ sub is_valid +@@ -1206,6 +1209,8 @@ if ($keyword eq "KRB5" && $no_krb5) { return 0; } if ($keyword eq "ENGINE" && $no_engine) { return 0; } if ($keyword eq "HW" && $no_hw) { return 0; } @@ -15949,11 +15803,11 @@ index c57c7f7..9eeafd9 100755 if ($keyword eq "FP_API" && $no_fp_api) { return 0; } if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; } if ($keyword eq "GMP" && $no_gmp) { return 0; } -diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl -index 0f5547f..8999977 100644 ---- a/util/pl/VC-32.pl -+++ b/util/pl/VC-32.pl -@@ -47,7 +47,7 @@ if ($FLAVOR =~ /WIN64/) +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.8.1.2.1.2.1 openssl/util/pl/VC-32.pl:1.10.2.3 +--- openssl/util/pl/VC-32.pl:1.7.2.1.4.1.2.1.4.1.8.1.2.1.2.1 Mon Jun 13 15:42:35 2016 ++++ openssl/util/pl/VC-32.pl Mon Jun 13 15:52:53 2016 +@@ -47,7 +47,7 @@ $base_cflags= " $mf_cflag"; my $f = $shlib || $fips ?' /MD':' /MT'; $opt_cflags=$f.' /Ox';