Commit 89bf0dc7 authored by Francis Dupont's avatar Francis Dupont

update OpenSSL patches (1.0.0k -> 1.0.0l, 1.0.1e -> 1.0.1f) [#35158]

parent 5cf53720
Index: openssl/Configure Index: openssl/Configure
diff -u openssl/Configure:1.9.2.1.2.1.4.1 openssl/Configure:1.11.2.1 diff -u openssl/Configure:1.9.2.1.2.1.4.1.2.1 openssl/Configure:1.11.2.2
--- openssl/Configure:1.9.2.1.2.1.4.1 Tue May 14 15:37:45 2013 --- openssl/Configure:1.9.2.1.2.1.4.1.2.1 Tue Jan 7 09:25:41 2014
+++ openssl/Configure Tue May 14 15:49:01 2013 +++ openssl/Configure Tue Jan 7 09:28:47 2014
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
# see INSTALL for instructions. # see INSTALL for instructions.
...@@ -150,7 +150,7 @@ diff -u openssl/Makefile.org:1.5.2.1.2.1 openssl/Makefile.org:1.6 ...@@ -150,7 +150,7 @@ diff -u openssl/Makefile.org:1.5.2.1.2.1 openssl/Makefile.org:1.6
Index: openssl/README.pkcs11 Index: openssl/README.pkcs11
diff -u /dev/null openssl/README.pkcs11:1.7.4.1 diff -u /dev/null openssl/README.pkcs11:1.7.4.1
--- /dev/null Fri Oct 4 14:35:09 2013 --- /dev/null Tue Jan 7 11:13:25 2014
+++ openssl/README.pkcs11 Fri Oct 4 14:33:56 2013 +++ openssl/README.pkcs11 Fri Oct 4 14:33:56 2013
@@ -0,0 +1,266 @@ @@ -0,0 +1,266 @@
+ISC modified +ISC modified
...@@ -610,7 +610,7 @@ diff -u openssl/crypto/engine/Makefile:1.8.2.1 openssl/crypto/engine/Makefile:1. ...@@ -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 tb_asnmth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
Index: openssl/crypto/engine/cryptoki.h Index: openssl/crypto/engine/cryptoki.h
diff -u /dev/null openssl/crypto/engine/cryptoki.h:1.4 diff -u /dev/null openssl/crypto/engine/cryptoki.h:1.4
--- /dev/null Fri Oct 4 14:35:09 2013 --- /dev/null Tue Jan 7 11:13:26 2014
+++ openssl/crypto/engine/cryptoki.h Thu Dec 18 00:14:12 2008 +++ openssl/crypto/engine/cryptoki.h Thu Dec 18 00:14:12 2008
@@ -0,0 +1,103 @@ @@ -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. ...@@ -754,7 +754,7 @@ diff -u openssl/crypto/engine/engine.h:1.5.2.1 openssl/crypto/engine/engine.h:1.
#endif #endif
Index: openssl/crypto/engine/hw_pk11.c Index: openssl/crypto/engine/hw_pk11.c
diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.30.4.2 diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.30.4.2
--- /dev/null Fri Oct 4 14:35:09 2013 --- /dev/null Tue Jan 7 11:13:26 2014
+++ openssl/crypto/engine/hw_pk11.c Fri Oct 4 14:33:56 2013 +++ openssl/crypto/engine/hw_pk11.c Fri Oct 4 14:33:56 2013
@@ -0,0 +1,4116 @@ @@ -0,0 +1,4116 @@
+/* +/*
...@@ -4875,7 +4875,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.30.4.2 ...@@ -4875,7 +4875,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.30.4.2
+#endif /* OPENSSL_NO_HW */ +#endif /* OPENSSL_NO_HW */
Index: openssl/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 diff -u /dev/null openssl/crypto/engine/hw_pk11_err.c:1.5
--- /dev/null Fri Oct 4 14:35:09 2013 --- /dev/null Tue Jan 7 11:13:26 2014
+++ openssl/crypto/engine/hw_pk11_err.c Tue Jun 14 00:43:26 2011 +++ openssl/crypto/engine/hw_pk11_err.c Tue Jun 14 00:43:26 2011
@@ -0,0 +1,288 @@ @@ -0,0 +1,288 @@
+/* +/*
...@@ -5168,7 +5168,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.c:1.5 ...@@ -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 Index: openssl/crypto/engine/hw_pk11_err.h
diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.12.4.1 diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.12.4.1
--- /dev/null Fri Oct 4 14:35:09 2013 --- /dev/null Tue Jan 7 11:13:26 2014
+++ openssl/crypto/engine/hw_pk11_err.h Fri Oct 4 14:33:56 2013 +++ openssl/crypto/engine/hw_pk11_err.h Fri Oct 4 14:33:56 2013
@@ -0,0 +1,440 @@ @@ -0,0 +1,440 @@
+/* +/*
...@@ -5613,7 +5613,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.12.4.1 ...@@ -5613,7 +5613,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.12.4.1
+#endif /* HW_PK11_ERR_H */ +#endif /* HW_PK11_ERR_H */
Index: openssl/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.38.2.3 diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.38.2.3
--- /dev/null Fri Oct 4 14:35:09 2013 --- /dev/null Tue Jan 7 11:13:26 2014
+++ openssl/crypto/engine/hw_pk11_pub.c Fri Oct 4 14:33:56 2013 +++ openssl/crypto/engine/hw_pk11_pub.c Fri Oct 4 14:33:56 2013
@@ -0,0 +1,3556 @@ @@ -0,0 +1,3556 @@
+/* +/*
...@@ -9174,7 +9174,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.38.2.3 ...@@ -9174,7 +9174,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.38.2.3
+#endif /* OPENSSL_NO_HW */ +#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/hw_pk11ca.h Index: openssl/crypto/engine/hw_pk11ca.h
diff -u /dev/null openssl/crypto/engine/hw_pk11ca.h:1.4 diff -u /dev/null openssl/crypto/engine/hw_pk11ca.h:1.4
--- /dev/null Fri Oct 4 14:35:10 2013 --- /dev/null Tue Jan 7 11:13:26 2014
+++ openssl/crypto/engine/hw_pk11ca.h Wed Jun 15 21:12:20 2011 +++ openssl/crypto/engine/hw_pk11ca.h Wed Jun 15 21:12:20 2011
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
+/* Redefine all pk11/PK11 external symbols to pk11ca/PK11CA */ +/* 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 ...@@ -9211,7 +9211,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11ca.h:1.4
+#define ENGINE_load_pk11 ENGINE_load_pk11ca +#define ENGINE_load_pk11 ENGINE_load_pk11ca
Index: openssl/crypto/engine/hw_pk11so.c Index: openssl/crypto/engine/hw_pk11so.c
diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.7.4.1 diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.7.4.1
--- /dev/null Fri Oct 4 14:35:10 2013 --- /dev/null Tue Jan 7 11:13:26 2014
+++ openssl/crypto/engine/hw_pk11so.c Fri Oct 4 14:33:56 2013 +++ openssl/crypto/engine/hw_pk11so.c Fri Oct 4 14:33:56 2013
@@ -0,0 +1,1775 @@ @@ -0,0 +1,1775 @@
+/* +/*
...@@ -10991,7 +10991,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.7.4.1 ...@@ -10991,7 +10991,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.7.4.1
+#endif /* OPENSSL_NO_HW */ +#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/hw_pk11so.h Index: openssl/crypto/engine/hw_pk11so.h
diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.4 diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.4
--- /dev/null Fri Oct 4 14:35:10 2013 --- /dev/null Tue Jan 7 11:13:26 2014
+++ openssl/crypto/engine/hw_pk11so.h Wed Jun 15 21:12:20 2011 +++ openssl/crypto/engine/hw_pk11so.h Wed Jun 15 21:12:20 2011
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
+/* Redefine all pk11/PK11 external symbols to pk11so/PK11SO */ +/* 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 ...@@ -11028,7 +11028,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.4
+#define ENGINE_load_pk11 ENGINE_load_pk11so +#define ENGINE_load_pk11 ENGINE_load_pk11so
Index: openssl/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.8.2.2 diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.8.2.2
--- /dev/null Fri Oct 4 14:35:10 2013 --- /dev/null Tue Jan 7 11:13:26 2014
+++ openssl/crypto/engine/hw_pk11so_pub.c Fri Oct 4 14:33:56 2013 +++ openssl/crypto/engine/hw_pk11so_pub.c Fri Oct 4 14:33:56 2013
@@ -0,0 +1,1642 @@ @@ -0,0 +1,1642 @@
+/* +/*
...@@ -12675,11 +12675,11 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.8.2.2 ...@@ -12675,11 +12675,11 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.8.2.2
+#endif /* OPENSSL_NO_HW */ +#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/pkcs11.h Index: openssl/crypto/engine/pkcs11.h
diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1 diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1
--- /dev/null Fri Oct 4 14:35:10 2013 --- /dev/null Tue Jan 7 11:13:26 2014
+++ openssl/crypto/engine/pkcs11.h Wed Oct 24 23:27:09 2007 +++ openssl/crypto/engine/pkcs11.h Wed Oct 24 23:27:09 2007
@@ -0,0 +1,299 @@ @@ -0,0 +1,299 @@
+/* pkcs11.h include file for PKCS #11. */ +/* 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 +/* License to copy and use this software is granted provided that it is
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface + * 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 ...@@ -12979,11 +12979,11 @@ diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1
+#endif +#endif
Index: openssl/crypto/engine/pkcs11f.h Index: openssl/crypto/engine/pkcs11f.h
diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1 diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1
--- /dev/null Fri Oct 4 14:35:10 2013 --- /dev/null Tue Jan 7 11:13:26 2014
+++ openssl/crypto/engine/pkcs11f.h Wed Oct 24 23:27:09 2007 +++ openssl/crypto/engine/pkcs11f.h Wed Oct 24 23:27:09 2007
@@ -0,0 +1,912 @@ @@ -0,0 +1,912 @@
+/* pkcs11f.h include file for PKCS #11. */ +/* 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 +/* License to copy and use this software is granted provided that it is
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface + * 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 ...@@ -13896,11 +13896,11 @@ diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1
+#endif +#endif
Index: openssl/crypto/engine/pkcs11t.h Index: openssl/crypto/engine/pkcs11t.h
diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2 diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2
--- /dev/null Fri Oct 4 14:35:10 2013 --- /dev/null Tue Jan 7 11:13:26 2014
+++ openssl/crypto/engine/pkcs11t.h Sat Aug 30 11:58:07 2008 +++ openssl/crypto/engine/pkcs11t.h Sat Aug 30 11:58:07 2008
@@ -0,0 +1,1885 @@ @@ -0,0 +1,1885 @@
+/* pkcs11t.h include file for PKCS #11. */ +/* pkcs11t.h include file for PKCS #11. */
+/* $Revision$ */ +/* $Revision: 1.2 $ */
+ +
+/* License to copy and use this software is granted provided that it is +/* License to copy and use this software is granted provided that it is
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface + * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
......
Index: openssl/Configure Index: openssl/Configure
diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1 openssl/Configure:1.13 diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1 openssl/Configure:1.14
--- openssl/Configure:1.9.2.1.2.1.2.1.2.1 Wed May 15 11:46:59 2013 --- openssl/Configure:1.9.2.1.2.1.2.1.2.1.2.1 Tue Jan 7 09:44:50 2014
+++ openssl/Configure Wed May 15 11:57:36 2013 +++ openssl/Configure Tue Jan 7 09:46:34 2014
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
# see INSTALL for instructions. # see INSTALL for instructions.
...@@ -135,9 +135,9 @@ diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1 openssl/Configure:1.13 ...@@ -135,9 +135,9 @@ diff -u openssl/Configure:1.9.2.1.2.1.2.1.2.1 openssl/Configure:1.13
s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/; s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/;
s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/; s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/;
Index: openssl/Makefile.org Index: openssl/Makefile.org
diff -u openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1 openssl/Makefile.org:1.8 diff -u openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1.2.1 openssl/Makefile.org:1.9
--- openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1 Wed May 15 11:46:59 2013 --- openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1.2.1 Tue Jan 7 09:44:51 2014
+++ openssl/Makefile.org Wed May 15 11:57:36 2013 +++ openssl/Makefile.org Tue Jan 7 09:46:34 2014
@@ -26,6 +26,9 @@ @@ -26,6 +26,9 @@
INSTALL_PREFIX= INSTALL_PREFIX=
INSTALLTOP=/usr/local/ssl INSTALLTOP=/usr/local/ssl
...@@ -150,7 +150,7 @@ diff -u openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1 openssl/Makefile.org:1.8 ...@@ -150,7 +150,7 @@ diff -u openssl/Makefile.org:1.5.2.1.2.1.2.1.2.1 openssl/Makefile.org:1.8
Index: openssl/README.pkcs11 Index: openssl/README.pkcs11
diff -u /dev/null openssl/README.pkcs11:1.8 diff -u /dev/null openssl/README.pkcs11:1.8
--- /dev/null Fri Oct 4 14:27:29 2013 --- /dev/null Tue Jan 7 11:14:50 2014
+++ openssl/README.pkcs11 Fri Oct 4 14:16:43 2013 +++ openssl/README.pkcs11 Fri Oct 4 14:16:43 2013
@@ -0,0 +1,266 @@ @@ -0,0 +1,266 @@
+ISC modified +ISC modified
...@@ -611,7 +611,7 @@ diff -u openssl/crypto/engine/Makefile:1.8.2.1.4.1 openssl/crypto/engine/Makefil ...@@ -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 tb_asnmth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
Index: openssl/crypto/engine/cryptoki.h Index: openssl/crypto/engine/cryptoki.h
diff -u /dev/null openssl/crypto/engine/cryptoki.h:1.4 diff -u /dev/null openssl/crypto/engine/cryptoki.h:1.4
--- /dev/null Fri Oct 4 14:27:30 2013 --- /dev/null Tue Jan 7 11:14:51 2014
+++ openssl/crypto/engine/cryptoki.h Thu Dec 18 00:14:12 2008 +++ openssl/crypto/engine/cryptoki.h Thu Dec 18 00:14:12 2008
@@ -0,0 +1,103 @@ @@ -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. ...@@ -755,7 +755,7 @@ diff -u openssl/crypto/engine/engine.h:1.5.2.1.4.1 openssl/crypto/engine/engine.
#endif #endif
Index: openssl/crypto/engine/hw_pk11.c Index: openssl/crypto/engine/hw_pk11.c
diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.33 diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.33
--- /dev/null Fri Oct 4 14:27:30 2013 --- /dev/null Tue Jan 7 11:14:51 2014
+++ openssl/crypto/engine/hw_pk11.c Fri Oct 4 14:07:41 2013 +++ openssl/crypto/engine/hw_pk11.c Fri Oct 4 14:07:41 2013
@@ -0,0 +1,4010 @@ @@ -0,0 +1,4010 @@
+/* +/*
...@@ -4770,7 +4770,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.33 ...@@ -4770,7 +4770,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.33
+#endif /* OPENSSL_NO_HW */ +#endif /* OPENSSL_NO_HW */
Index: openssl/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 diff -u /dev/null openssl/crypto/engine/hw_pk11_err.c:1.5
--- /dev/null Fri Oct 4 14:27:30 2013 --- /dev/null Tue Jan 7 11:14:51 2014
+++ openssl/crypto/engine/hw_pk11_err.c Tue Jun 14 00:43:26 2011 +++ openssl/crypto/engine/hw_pk11_err.c Tue Jun 14 00:43:26 2011
@@ -0,0 +1,288 @@ @@ -0,0 +1,288 @@
+/* +/*
...@@ -5063,7 +5063,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.c:1.5 ...@@ -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 Index: openssl/crypto/engine/hw_pk11_err.h
diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.13 diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.13
--- /dev/null Fri Oct 4 14:27:30 2013 --- /dev/null Tue Jan 7 11:14:51 2014
+++ openssl/crypto/engine/hw_pk11_err.h Fri Oct 4 14:04:20 2013 +++ openssl/crypto/engine/hw_pk11_err.h Fri Oct 4 14:04:20 2013
@@ -0,0 +1,440 @@ @@ -0,0 +1,440 @@
+/* +/*
...@@ -5508,7 +5508,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.13 ...@@ -5508,7 +5508,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.13
+#endif /* HW_PK11_ERR_H */ +#endif /* HW_PK11_ERR_H */
Index: openssl/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 diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.42
--- /dev/null Fri Oct 4 14:27:30 2013 --- /dev/null Tue Jan 7 11:14:51 2014
+++ openssl/crypto/engine/hw_pk11_pub.c Fri Oct 4 14:27:06 2013 +++ openssl/crypto/engine/hw_pk11_pub.c Fri Oct 4 14:27:06 2013
@@ -0,0 +1,3556 @@ @@ -0,0 +1,3556 @@
+/* +/*
...@@ -9069,7 +9069,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.42 ...@@ -9069,7 +9069,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.42
+#endif /* OPENSSL_NO_HW */ +#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/hw_pk11ca.h Index: openssl/crypto/engine/hw_pk11ca.h
diff -u /dev/null openssl/crypto/engine/hw_pk11ca.h:1.4 diff -u /dev/null openssl/crypto/engine/hw_pk11ca.h:1.4
--- /dev/null Fri Oct 4 14:27:30 2013 --- /dev/null Tue Jan 7 11:14:51 2014
+++ openssl/crypto/engine/hw_pk11ca.h Wed Jun 15 21:12:20 2011 +++ openssl/crypto/engine/hw_pk11ca.h Wed Jun 15 21:12:20 2011
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
+/* Redefine all pk11/PK11 external symbols to pk11ca/PK11CA */ +/* 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 ...@@ -9106,7 +9106,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11ca.h:1.4
+#define ENGINE_load_pk11 ENGINE_load_pk11ca +#define ENGINE_load_pk11 ENGINE_load_pk11ca
Index: openssl/crypto/engine/hw_pk11so.c Index: openssl/crypto/engine/hw_pk11so.c
diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.8 diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.8
--- /dev/null Fri Oct 4 14:27:30 2013 --- /dev/null Tue Jan 7 11:14:51 2014
+++ openssl/crypto/engine/hw_pk11so.c Fri Oct 4 14:05:16 2013 +++ openssl/crypto/engine/hw_pk11so.c Fri Oct 4 14:05:16 2013
@@ -0,0 +1,1775 @@ @@ -0,0 +1,1775 @@
+/* +/*
...@@ -10886,7 +10886,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.8 ...@@ -10886,7 +10886,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.8
+#endif /* OPENSSL_NO_HW */ +#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/hw_pk11so.h Index: openssl/crypto/engine/hw_pk11so.h
diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.4 diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.4
--- /dev/null Fri Oct 4 14:27:30 2013 --- /dev/null Tue Jan 7 11:14:51 2014
+++ openssl/crypto/engine/hw_pk11so.h Wed Jun 15 21:12:20 2011 +++ openssl/crypto/engine/hw_pk11so.h Wed Jun 15 21:12:20 2011
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
+/* Redefine all pk11/PK11 external symbols to pk11so/PK11SO */ +/* 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 ...@@ -10923,7 +10923,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.4
+#define ENGINE_load_pk11 ENGINE_load_pk11so +#define ENGINE_load_pk11 ENGINE_load_pk11so
Index: openssl/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 diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.10
--- /dev/null Fri Oct 4 14:27:30 2013 --- /dev/null Tue Jan 7 11:14:51 2014
+++ openssl/crypto/engine/hw_pk11so_pub.c Fri Oct 4 14:05:38 2013 +++ openssl/crypto/engine/hw_pk11so_pub.c Fri Oct 4 14:05:38 2013
@@ -0,0 +1,1642 @@ @@ -0,0 +1,1642 @@
+/* +/*
...@@ -12570,11 +12570,11 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.10 ...@@ -12570,11 +12570,11 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.10
+#endif /* OPENSSL_NO_HW */ +#endif /* OPENSSL_NO_HW */
Index: openssl/crypto/engine/pkcs11.h Index: openssl/crypto/engine/pkcs11.h
diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1 diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1
--- /dev/null Fri Oct 4 14:27:30 2013 --- /dev/null Tue Jan 7 11:14:51 2014
+++ openssl/crypto/engine/pkcs11.h Wed Oct 24 23:27:09 2007 +++ openssl/crypto/engine/pkcs11.h Wed Oct 24 23:27:09 2007
@@ -0,0 +1,299 @@ @@ -0,0 +1,299 @@
+/* pkcs11.h include file for PKCS #11. */ +/* 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 +/* License to copy and use this software is granted provided that it is
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface + * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
...@@ -12874,11 +12874,11 @@ diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1 ...@@ -12874,11 +12874,11 @@ diff -u /dev/null openssl/crypto/engine/pkcs11.h:1.1.1.1
+#endif +#endif
Index: openssl/crypto/engine/pkcs11f.h Index: openssl/crypto/engine/pkcs11f.h
diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1 diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1
--- /dev/null Fri Oct 4 14:27:30 2013 --- /dev/null Tue Jan 7 11:14:51 2014
+++ openssl/crypto/engine/pkcs11f.h Wed Oct 24 23:27:09 2007 +++ openssl/crypto/engine/pkcs11f.h Wed Oct 24 23:27:09 2007
@@ -0,0 +1,912 @@ @@ -0,0 +1,912 @@
+/* pkcs11f.h include file for PKCS #11. */ +/* 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 +/* License to copy and use this software is granted provided that it is
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface + * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
...@@ -13791,11 +13791,11 @@ diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1 ...@@ -13791,11 +13791,11 @@ diff -u /dev/null openssl/crypto/engine/pkcs11f.h:1.1.1.1
+#endif +#endif
Index: openssl/crypto/engine/pkcs11t.h Index: openssl/crypto/engine/pkcs11t.h
diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2 diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2
--- /dev/null Fri Oct 4 14:27:30 2013 --- /dev/null Tue Jan 7 11:14:51 2014
+++ openssl/crypto/engine/pkcs11t.h Sat Aug 30 11:58:07 2008 +++ openssl/crypto/engine/pkcs11t.h Sat Aug 30 11:58:07 2008
@@ -0,0 +1,1885 @@ @@ -0,0 +1,1885 @@
+/* pkcs11t.h include file for PKCS #11. */ +/* pkcs11t.h include file for PKCS #11. */
+/* $Revision$ */ +/* $Revision: 1.2 $ */
+ +
+/* License to copy and use this software is granted provided that it is +/* License to copy and use this software is granted provided that it is
+ * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface + * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment