mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-31 14:35:26 +00:00
update OpenSSL 1.0.0 patch
This commit is contained in:
@@ -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 Thu Jul 3 12:42:32 2014
|
||||
--- /dev/null Fri Jan 2 14:26:16 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 Thu Jul 3 12:42:32 2014
|
||||
--- /dev/null Fri Jan 2 14:26:16 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 Thu Jul 3 12:42:32 2014
|
||||
--- /dev/null Fri Jan 2 14:26:16 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 Thu Jul 3 12:42:32 2014
|
||||
--- /dev/null Fri Jan 2 14:26:16 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 Thu Jul 3 12:42:32 2014
|
||||
--- /dev/null Fri Jan 2 14:26:16 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 Thu Jul 3 12:42:32 2014
|
||||
--- /dev/null Fri Jan 2 14:26:16 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 Thu Jul 3 12:42:33 2014
|
||||
--- /dev/null Fri Jan 2 14:26:17 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 Thu Jul 3 12:42:33 2014
|
||||
--- /dev/null Fri Jan 2 14:26:17 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 Thu Jul 3 12:42:33 2014
|
||||
--- /dev/null Fri Jan 2 14:26:17 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 Thu Jul 3 12:42:33 2014
|
||||
--- /dev/null Fri Jan 2 14:26:17 2015
|
||||
+++ openssl/crypto/engine/hw_pk11so_pub.c Fri Oct 4 14:33:56 2013
|
||||
@@ -0,0 +1,1642 @@
|
||||
+/*
|
||||
@@ -12675,11 +12675,11 @@ 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 Thu Jul 3 12:42:33 2014
|
||||
--- /dev/null Fri Jan 2 14:26:17 2015
|
||||
+++ openssl/crypto/engine/pkcs11.h Wed Oct 24 23:27:09 2007
|
||||
@@ -0,0 +1,299 @@
|
||||
+/* pkcs11.h include file for PKCS #11. */
|
||||
+/* $Revision$ */
|
||||
+/* $Revision: 1.1.1.1 $ */
|
||||
+
|
||||
+/* License to copy and use this software is granted provided that it is
|
||||
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
|
||||
@@ -12979,11 +12979,11 @@ 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 Thu Jul 3 12:42:33 2014
|
||||
--- /dev/null Fri Jan 2 14:26:17 2015
|
||||
+++ openssl/crypto/engine/pkcs11f.h Wed Oct 24 23:27:09 2007
|
||||
@@ -0,0 +1,912 @@
|
||||
+/* pkcs11f.h include file for PKCS #11. */
|
||||
+/* $Revision$ */
|
||||
+/* $Revision: 1.1.1.1 $ */
|
||||
+
|
||||
+/* License to copy and use this software is granted provided that it is
|
||||
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
|
||||
@@ -13896,11 +13896,11 @@ 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 Thu Jul 3 12:42:33 2014
|
||||
--- /dev/null Fri Jan 2 14:26:17 2015
|
||||
+++ openssl/crypto/engine/pkcs11t.h Sat Aug 30 11:58:07 2008
|
||||
@@ -0,0 +1,1885 @@
|
||||
+/* pkcs11t.h include file for PKCS #11. */
|
||||
+/* $Revision$ */
|
||||
+/* $Revision: 1.2 $ */
|
||||
+
|
||||
+/* License to copy and use this software is granted provided that it is
|
||||
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
|
Reference in New Issue
Block a user