upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-02-22 17:30:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated OpenSSL PKCS#11 engine patches

Browse source
This commit is contained in:
Francis Dupont 2015-03-04 15:15:01 +01:00
parent 012ce6857e
commit caaff35375
4 changed files with 80 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
bin/pkcs11/openssl-0.9.8zc-patch → bin/pkcs11/openssl-0.9.8ze-patch
View file

@ -150,7 +150,7 @@ diff -u openssl/Makefile.org:1.4.6.1.6.1 openssl/Makefile.org:1.4.2.1
Index: openssl/README.pkcs11
diff -u /dev/null openssl/README.pkcs11:1.6.4.2
--- /dev/null Fri Jan 2 13:56:40 2015
--- /dev/null Wed Mar 4 13:58:07 2015
+++ openssl/README.pkcs11 Fri Oct 4 14:45:25 2013
@@ -0,0 +1,266 @@
+ISC modified
@ -629,7 +629,7 @@ diff -u openssl/crypto/engine/Makefile:1.6.6.1 openssl/crypto/engine/Makefile:1.
tb_cipher.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 Fri Jan 2 13:56:40 2015
--- /dev/null Wed Mar 4 13:58:07 2015
+++ openssl/crypto/engine/cryptoki.h Thu Dec 18 00:14:12 2008
@@ -0,0 +1,103 @@
+/*
@ -773,7 +773,7 @@ diff -u openssl/crypto/engine/engine.h:1.4.6.1.6.1 openssl/crypto/engine/engine.
* "registry" handling. */
Index: openssl/crypto/engine/hw_pk11.c
diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.26.4.4
--- /dev/null Fri Jan 2 13:56:40 2015
--- /dev/null Wed Mar 4 13:58:07 2015
+++ openssl/crypto/engine/hw_pk11.c Fri Oct 4 14:45:25 2013
@@ -0,0 +1,4116 @@
+/*
@ -4894,7 +4894,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.26.4.4
+#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/hw_pk11_err.c
diff -u /dev/null openssl/crypto/engine/hw_pk11_err.c:1.4.10.1
--- /dev/null Fri Jan 2 13:56:40 2015
--- /dev/null Wed Mar 4 13:58:07 2015
+++ openssl/crypto/engine/hw_pk11_err.c Tue Jun 14 21:52:40 2011
@@ -0,0 +1,288 @@
+/*
@ -5187,7 +5187,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.c:1.4.10.1
+}
Index: openssl/crypto/engine/hw_pk11_err.h
diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.9.10.2
--- /dev/null Fri Jan 2 13:56:40 2015
--- /dev/null Wed Mar 4 13:58:07 2015
+++ openssl/crypto/engine/hw_pk11_err.h Fri Oct 4 14:45:25 2013
@@ -0,0 +1,440 @@
+/*
@ -5632,7 +5632,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.9.10.2
+#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.32.4.7
--- /dev/null Fri Jan 2 13:56:40 2015
--- /dev/null Wed Mar 4 13:58:07 2015
+++ openssl/crypto/engine/hw_pk11_pub.c Fri Oct 4 14:45:25 2013
@@ -0,0 +1,3556 @@
+/*
@ -9193,7 +9193,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.32.4.7
+#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/hw_pk11ca.h
diff -u /dev/null openssl/crypto/engine/hw_pk11ca.h:1.2.4.2
--- /dev/null Fri Jan 2 13:56:41 2015
--- /dev/null Wed Mar 4 13:58:08 2015
+++ openssl/crypto/engine/hw_pk11ca.h Wed Jun 15 21:12:32 2011
@@ -0,0 +1,32 @@
+/* Redefine all pk11/PK11 external symbols to pk11ca/PK11CA */
@ -9230,7 +9230,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11ca.h:1.2.4.2
+#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.3.4.3
--- /dev/null Fri Jan 2 13:56:41 2015
--- /dev/null Wed Mar 4 13:58:08 2015
+++ openssl/crypto/engine/hw_pk11so.c Fri Oct 4 14:45:25 2013
@@ -0,0 +1,1775 @@
+/*
@ -11010,7 +11010,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.3.4.3
+#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/hw_pk11so.h
diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.2.4.2
--- /dev/null Fri Jan 2 13:56:41 2015
--- /dev/null Wed Mar 4 13:58:08 2015
+++ openssl/crypto/engine/hw_pk11so.h Wed Jun 15 21:12:32 2011
@@ -0,0 +1,32 @@
+/* Redefine all pk11/PK11 external symbols to pk11so/PK11SO */
@ -11047,7 +11047,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.2.4.2
+#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.2.4.6
--- /dev/null Fri Jan 2 13:56:41 2015
--- /dev/null Wed Mar 4 13:58:08 2015
+++ openssl/crypto/engine/hw_pk11so_pub.c Fri Oct 4 14:45:25 2013
@@ -0,0 +1,1642 @@
+/*
@ -12694,7 +12694,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.2.4.6
+#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 Fri Jan 2 13:56:41 2015
--- /dev/null Wed Mar 4 13:58:08 2015
+++ openssl/crypto/engine/pkcs11.h Wed Oct 24 23:27:09 2007
@@ -0,0 +1,299 @@
+/* pkcs11.h include file for PKCS #11. */
@ -12998,7 +12998,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 Fri Jan 2 13:56:41 2015
--- /dev/null Wed Mar 4 13:58:08 2015
+++ openssl/crypto/engine/pkcs11f.h Wed Oct 24 23:27:09 2007
@@ -0,0 +1,912 @@
+/* pkcs11f.h include file for PKCS #11. */
@ -13915,7 +13915,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 Fri Jan 2 13:56:41 2015
--- /dev/null Wed Mar 4 13:58:08 2015
+++ openssl/crypto/engine/pkcs11t.h Sat Aug 30 11:58:07 2008
@@ -0,0 +1,1885 @@
+/* pkcs11t.h include file for PKCS #11. */
@ -15804,19 +15804,20 @@ diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2
+
+#endif
Index: openssl/util/libeay.num
diff -u openssl/util/libeay.num:1.7.6.1.4.1.2.1 openssl/util/libeay.num:1.7.2.2
--- openssl/util/libeay.num:1.7.6.1.4.1.2.1 Thu Jul 3 12:12:37 2014
+++ openssl/util/libeay.num Thu Jul 3 12:32:04 2014
@@ -3730,3 +3730,5 @@
diff -u openssl/util/libeay.num:1.7.6.1.4.1.2.1.4.1 openssl/util/libeay.num:1.7.2.3
--- openssl/util/libeay.num:1.7.6.1.4.1.2.1.4.1 Wed Mar 4 13:46:38 2015
+++ openssl/util/libeay.num Wed Mar 4 13:57:56 2015
@@ -3731,4 +3731,6 @@
pqueue_size 4114 EXIST::FUNCTION:
OPENSSL_uni2asc 4115 EXIST:NETWARE:FUNCTION:
OPENSSL_asc2uni 4116 EXIST:NETWARE:FUNCTION:
+ENGINE_load_pk11ca 4117 EXIST::FUNCTION:HW_PKCS11CA,ENGINE
+ENGINE_load_pk11so 4117 EXIST::FUNCTION:HW_PKCS11SO,ENGINE
ASN1_TYPE_cmp 4428 EXIST::FUNCTION:
Index: openssl/util/mk1mf.pl
diff -u openssl/util/mk1mf.pl:1.8.6.1 openssl/util/mk1mf.pl:1.8
--- openssl/util/mk1mf.pl:1.8.6.1 Sun Jan 15 15:45:40 2012
+++ openssl/util/mk1mf.pl Mon Jun 13 14:25:25 2011
diff -u openssl/util/mk1mf.pl:1.8.6.1.10.1 openssl/util/mk1mf.pl:1.8.2.1
--- openssl/util/mk1mf.pl:1.8.6.1.10.1 Wed Mar 4 13:46:38 2015
+++ openssl/util/mk1mf.pl Wed Mar 4 13:57:57 2015
@@ -87,6 +87,8 @@
no-ecdh - No ECDH
no-engine - No engine
@ -15845,7 +15846,7 @@ diff -u openssl/util/mk1mf.pl:1.8.6.1 openssl/util/mk1mf.pl:1.8
if ($key eq "KRB5_INCLUDES")
{ $cflags .= " $val";}
@@ -1301,6 +1308,8 @@
@@ -1295,6 +1302,8 @@
"no-ecdh" => \$no_ecdh,
"no-engine" => \$no_engine,
"no-hw" => \$no_hw,

42
bin/pkcs11/openssl-1.0.0o-patch → bin/pkcs11/openssl-1.0.0q-patch
View file

@ -150,7 +150,7 @@ diff -u openssl/Makefile.org:1.5.2.1.2.1 openssl/Makefile.org:1.6
Index: openssl/README.pkcs11
diff -u /dev/null openssl/README.pkcs11:1.7.4.1
--- /dev/null Fri Jan 2 14:26:16 2015
--- /dev/null Wed Mar 4 14:05:03 2015
+++ openssl/README.pkcs11 Fri Oct 4 14:33:56 2013
@@ -0,0 +1,266 @@
+ISC modified
@ -610,7 +610,7 @@ diff -u openssl/crypto/engine/Makefile:1.8.2.1 openssl/crypto/engine/Makefile:1.
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 Fri Jan 2 14:26:16 2015
--- /dev/null Wed Mar 4 14:05:03 2015
+++ openssl/crypto/engine/cryptoki.h Thu Dec 18 00:14:12 2008
@@ -0,0 +1,103 @@
+/*
@ -754,7 +754,7 @@ diff -u openssl/crypto/engine/engine.h:1.5.2.1 openssl/crypto/engine/engine.h:1.
#endif
Index: openssl/crypto/engine/hw_pk11.c
diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.30.4.2
--- /dev/null Fri Jan 2 14:26:16 2015
--- /dev/null Wed Mar 4 14:05:03 2015
+++ openssl/crypto/engine/hw_pk11.c Fri Oct 4 14:33:56 2013
@@ -0,0 +1,4116 @@
+/*
@ -4875,7 +4875,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.30.4.2
+#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 Fri Jan 2 14:26:16 2015
--- /dev/null Wed Mar 4 14:05:03 2015
+++ openssl/crypto/engine/hw_pk11_err.c Tue Jun 14 00:43:26 2011
@@ -0,0 +1,288 @@
+/*
@ -5168,7 +5168,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.12.4.1
--- /dev/null Fri Jan 2 14:26:16 2015
--- /dev/null Wed Mar 4 14:05:03 2015
+++ openssl/crypto/engine/hw_pk11_err.h Fri Oct 4 14:33:56 2013
@@ -0,0 +1,440 @@
+/*
@ -5613,7 +5613,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.12.4.1
+#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.38.2.3
--- /dev/null Fri Jan 2 14:26:16 2015
--- /dev/null Wed Mar 4 14:05:03 2015
+++ openssl/crypto/engine/hw_pk11_pub.c Fri Oct 4 14:33:56 2013
@@ -0,0 +1,3556 @@
+/*
@ -9174,7 +9174,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.38.2.3
+#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 Fri Jan 2 14:26:17 2015
--- /dev/null Wed Mar 4 14:05:03 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 */
@ -9211,7 +9211,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.7.4.1
--- /dev/null Fri Jan 2 14:26:17 2015
--- /dev/null Wed Mar 4 14:05:03 2015
+++ openssl/crypto/engine/hw_pk11so.c Fri Oct 4 14:33:56 2013
@@ -0,0 +1,1775 @@
+/*
@ -10991,7 +10991,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.7.4.1
+#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 Fri Jan 2 14:26:17 2015
--- /dev/null Wed Mar 4 14:05:03 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 */
@ -11028,7 +11028,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.8.2.2
--- /dev/null Fri Jan 2 14:26:17 2015
--- /dev/null Wed Mar 4 14:05:03 2015
+++ openssl/crypto/engine/hw_pk11so_pub.c Fri Oct 4 14:33:56 2013
@@ -0,0 +1,1642 @@
+/*
@ -12675,7 +12675,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.8.2.2
+#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 Fri Jan 2 14:26:17 2015
--- /dev/null Wed Mar 4 14:05:03 2015
+++ openssl/crypto/engine/pkcs11.h Wed Oct 24 23:27:09 2007
@@ -0,0 +1,299 @@
+/* pkcs11.h include file for PKCS #11. */
@ -12979,7 +12979,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 Fri Jan 2 14:26:17 2015
--- /dev/null Wed Mar 4 14:05:03 2015
+++ openssl/crypto/engine/pkcs11f.h Wed Oct 24 23:27:09 2007
@@ -0,0 +1,912 @@
+/* pkcs11f.h include file for PKCS #11. */
@ -13896,7 +13896,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 Fri Jan 2 14:26:17 2015
--- /dev/null Wed Mar 4 14:05:03 2015
+++ openssl/crypto/engine/pkcs11t.h Sat Aug 30 11:58:07 2008
@@ -0,0 +1,1885 @@
+/* pkcs11t.h include file for PKCS #11. */
@ -15785,19 +15785,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.6.1.4.1 openssl/util/libeay.num:1.9.2.2
--- openssl/util/libeay.num:1.8.2.1.6.1.4.1 Thu Jul 3 12:17:29 2014
+++ openssl/util/libeay.num Thu Jul 3 12:35:43 2014
@@ -4196,3 +4196,5 @@
diff -u openssl/util/libeay.num:1.8.2.1.6.1.4.1.4.1 openssl/util/libeay.num:1.9.2.3
--- openssl/util/libeay.num:1.8.2.1.6.1.4.1.4.1 Wed Mar 4 14:03:24 2015
+++ openssl/util/libeay.num Wed Mar 4 14:04:40 2015
@@ -4197,3 +4197,5 @@
OPENSSL_strncasecmp 4566 EXIST::FUNCTION:
OPENSSL_gmtime 4567 EXIST::FUNCTION:
OPENSSL_gmtime_adj 4568 EXIST::FUNCTION:
+ENGINE_load_pk11ca 4569 EXIST::FUNCTION:HW_PKCS11CA,ENGINE
+ENGINE_load_pk11so 4569 EXIST::FUNCTION:HW_PKCS11SO,ENGINE
Index: openssl/util/mk1mf.pl
diff -u openssl/util/mk1mf.pl:1.9.2.1 openssl/util/mk1mf.pl:1.9
--- openssl/util/mk1mf.pl:1.9.2.1 Sun Jan 15 16:09:52 2012
+++ openssl/util/mk1mf.pl Mon Jun 13 17:13:56 2011
diff -u openssl/util/mk1mf.pl:1.9.2.1.14.1 openssl/util/mk1mf.pl:1.9.4.1
--- openssl/util/mk1mf.pl:1.9.2.1.14.1 Wed Mar 4 14:03:25 2015
+++ openssl/util/mk1mf.pl Wed Mar 4 14:04:40 2015
@@ -109,6 +109,8 @@
no-ecdh - No ECDH
no-engine - No engine
@ -15826,7 +15826,7 @@ diff -u openssl/util/mk1mf.pl:1.9.2.1 openssl/util/mk1mf.pl:1.9
if ($key eq "KRB5_INCLUDES")
{ $cflags .= " $val";}
@@ -1067,6 +1074,8 @@
@@ -1061,6 +1068,8 @@
"no-gost" => \$no_gost,
"no-engine" => \$no_engine,
"no-hw" => \$no_hw,

68
bin/pkcs11/openssl-1.0.1j-patch → bin/pkcs11/openssl-1.0.1l-patch
View file

@ -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 openssl/Configure:1.16
--- openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1 Fri Jan 2 14:55:31 2015
+++ openssl/Configure Fri Jan 2 14:56:42 2015
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
@@ -10,7 +10,7 @@
# see INSTALL for instructions.
@ -53,7 +53,7 @@ diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1 openssl/Configure:1.16
my $prefix="";
my $libdir="";
my $openssldir="";
@@ -877,6 +887,14 @@
@@ -882,6 +892,14 @@
$_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei;
$flags.=$_." ";
}
@ -68,7 +68,7 @@ diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1 openssl/Configure:1.16
elsif (/^--prefix=(.*)$/)
{
$prefix=$1;
@@ -1044,6 +1062,22 @@
@@ -1049,6 +1067,22 @@
exit 0;
}
@ -91,7 +91,7 @@ diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1 openssl/Configure:1.16
if ($target =~ m/^CygWin32(-.*)$/) {
$target = "Cygwin".$1;
}
@@ -1121,6 +1155,25 @@
@@ -1126,6 +1160,25 @@
$exp_cflags .= " -DOPENSSL_EXPERIMENTAL_$ALGO";
}
@ -117,7 +117,7 @@ diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1 openssl/Configure:1.16
my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/);
@@ -1210,6 +1263,8 @@
@@ -1215,6 +1268,8 @@
if ($flags ne "") { $cflags="$flags$cflags"; }
else { $no_user_cflags=1; }
@ -126,7 +126,7 @@ diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1.2.1.4.1 openssl/Configure:1.16
# Kerberos settings. The flavor must be provided from outside, either through
# the script "config" or manually.
if (!$no_krb5)
@@ -1599,6 +1654,7 @@
@@ -1604,6 +1659,7 @@
s/^VERSION=.*/VERSION=$version/;
s/^MAJOR=.*/MAJOR=$major/;
s/^MINOR=.*/MINOR=$minor/;
@ -150,7 +150,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 Fri Jan 2 14:59:07 2015
--- /dev/null Wed Mar 4 14:12:35 2015
+++ openssl/README.pkcs11 Fri Oct 4 14:16:43 2013
@@ -0,0 +1,266 @@
+ISC modified
@ -611,7 +611,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 Fri Jan 2 14:59:08 2015
--- /dev/null Wed Mar 4 14:12:35 2015
+++ openssl/crypto/engine/cryptoki.h Thu Dec 18 00:14:12 2008
@@ -0,0 +1,103 @@
+/*
@ -755,7 +755,7 @@ diff -u openssl/crypto/engine/engine.h:1.5.2.1.4.1 openssl/crypto/engine/engine.
#endif
Index: openssl/crypto/engine/hw_pk11.c
diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.33
--- /dev/null Fri Jan 2 14:59:08 2015
--- /dev/null Wed Mar 4 14:12:35 2015
+++ openssl/crypto/engine/hw_pk11.c Fri Oct 4 14:07:41 2013
@@ -0,0 +1,4010 @@
+/*
@ -4770,7 +4770,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 Fri Jan 2 14:59:08 2015
--- /dev/null Wed Mar 4 14:12:35 2015
+++ openssl/crypto/engine/hw_pk11_err.c Tue Jun 14 00:43:26 2011
@@ -0,0 +1,288 @@
+/*
@ -5063,7 +5063,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 Fri Jan 2 14:59:08 2015
--- /dev/null Wed Mar 4 14:12:35 2015
+++ openssl/crypto/engine/hw_pk11_err.h Fri Oct 4 14:04:20 2013
@@ -0,0 +1,440 @@
+/*
@ -5508,7 +5508,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 Fri Jan 2 14:59:08 2015
--- /dev/null Wed Mar 4 14:12:35 2015
+++ openssl/crypto/engine/hw_pk11_pub.c Fri Oct 4 14:27:06 2013
@@ -0,0 +1,3556 @@
+/*
@ -9069,7 +9069,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 Fri Jan 2 14:59:08 2015
--- /dev/null Wed Mar 4 14:12:35 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 +9106,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 Fri Jan 2 14:59:08 2015
--- /dev/null Wed Mar 4 14:12:35 2015
+++ openssl/crypto/engine/hw_pk11so.c Fri Oct 4 14:05:16 2013
@@ -0,0 +1,1775 @@
+/*
@ -10886,7 +10886,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 Fri Jan 2 14:59:08 2015
--- /dev/null Wed Mar 4 14:12:35 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 +10923,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 Fri Jan 2 14:59:08 2015
--- /dev/null Wed Mar 4 14:12:35 2015
+++ openssl/crypto/engine/hw_pk11so_pub.c Fri Oct 4 14:05:38 2013
@@ -0,0 +1,1642 @@
+/*
@ -12570,7 +12570,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 Fri Jan 2 14:59:08 2015
--- /dev/null Wed Mar 4 14:12:36 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 +12874,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 Fri Jan 2 14:59:08 2015
--- /dev/null Wed Mar 4 14:12:36 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 +13791,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 Fri Jan 2 14:59:08 2015
--- /dev/null Wed Mar 4 14:12:36 2015
+++ openssl/crypto/engine/pkcs11t.h Sat Aug 30 11:58:07 2008
@@ -0,0 +1,1885 @@
+/* pkcs11t.h include file for PKCS #11. */
@ -15680,19 +15680,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 openssl/util/libeay.num:1.12
--- openssl/util/libeay.num:1.8.2.1.4.1.2.1.4.1 Mon Apr 14 12:42:50 2014
+++ openssl/util/libeay.num Mon Apr 14 12:44:22 2014
@@ -4312,3 +4312,5 @@
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 @@
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 openssl/util/mk1mf.pl:1.11
--- openssl/util/mk1mf.pl:1.9.2.1.4.1.10.1 Fri Jan 2 14:55:51 2015
+++ openssl/util/mk1mf.pl Fri Jan 2 14:56:55 2015
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
@@ -114,6 +114,8 @@
no-ecdh - No ECDH
no-engine - No engine
@ -15731,9 +15731,9 @@ diff -u openssl/util/mk1mf.pl:1.9.2.1.4.1.10.1 openssl/util/mk1mf.pl:1.11
"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 openssl/util/mkdef.pl:1.10
--- openssl/util/mkdef.pl:1.7.2.1.4.1.10.1 Fri Jan 2 14:55:51 2015
+++ openssl/util/mkdef.pl Fri Jan 2 14:56:55 2015
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
@@ -96,7 +96,7 @@
# External "algorithms"
"FP_API", "STDIO", "SOCK", "KRB5", "DGRAM",
@ -15743,7 +15743,7 @@ diff -u openssl/util/mkdef.pl:1.7.2.1.4.1.10.1 openssl/util/mkdef.pl:1.10
# RFC3779
"RFC3779",
# TLS
@@ -137,6 +137,7 @@
@@ -139,6 +139,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;
@ -15751,7 +15751,7 @@ diff -u openssl/util/mkdef.pl:1.7.2.1.4.1.10.1 openssl/util/mkdef.pl:1.10
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;
@@ -242,6 +243,8 @@
@@ -245,6 +246,8 @@
elsif (/^no-sctp$/) { $no_sctp=1; }
elsif (/^no-srtp$/) { $no_srtp=1; }
elsif (/^no-unit-test$/){ $no_unit_test=1; }
@ -15760,7 +15760,7 @@ diff -u openssl/util/mkdef.pl:1.7.2.1.4.1.10.1 openssl/util/mkdef.pl:1.10
}
@@ -1196,6 +1199,8 @@
@@ -1199,6 +1202,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; }

6
util/copyrights
View file

@ -318,9 +318,9 @@
./bin/pkcs11/.gitignore X 2014
./bin/pkcs11/Makefile.in MAKE 2009,2012,2014
./bin/pkcs11/OLD-PKCS11-NOTES X 2009
./bin/pkcs11/openssl-0.9.8zc-patch X 2015
./bin/pkcs11/openssl-1.0.0o-patch X 2015
./bin/pkcs11/openssl-1.0.1j-patch X 2015
./bin/pkcs11/openssl-0.9.8ze-patch X 2015
./bin/pkcs11/openssl-1.0.0q-patch X 2015
./bin/pkcs11/openssl-1.0.1l-patch X 2015
./bin/pkcs11/pkcs11-destroy.8 MAN DOCBOOK
./bin/pkcs11/pkcs11-destroy.c X 2009,2010,2014
./bin/pkcs11/pkcs11-destroy.docbook SGML 2009,2014