Commit dc6cea04 authored by Evan Hunt's avatar Evan Hunt
Browse files

[master] update openssl pkcs11 patches

3464.	[maint]		Updates to PKCS#11 openssl patches, supporting
			versions 0.9.8x, 1.0.0j, 1.0.1c [RT #29749]
parent 03ccae04
3464. [maint] Updates to PKCS#11 openssl patches, supporting
versions 0.9.8x, 1.0.0j, 1.0.1c [RT #29749]
3463. [doc] Clarify managed-keys syntax in ARM. [RT 32232]
3462. [doc] Clarify server selection behavior of dig when using
......
......@@ -150,7 +150,7 @@ diff -u openssl/Makefile.org:1.4.6.1 openssl/Makefile.org:1.4
Index: openssl/README.pkcs11
diff -u /dev/null openssl/README.pkcs11:1.6.4.1
--- /dev/null Mon Jan 16 18:53:41 2012
--- /dev/null Tue Jun 19 16:24:30 2012
+++ openssl/README.pkcs11 Mon Jun 13 18:27:39 2011
@@ -0,0 +1,261 @@
+ISC modified
......@@ -624,7 +624,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 Mon Jan 16 18:53:42 2012
--- /dev/null Tue Jun 19 16:24:30 2012
+++ openssl/crypto/engine/cryptoki.h Thu Dec 18 00:14:12 2008
@@ -0,0 +1,103 @@
+/*
......@@ -768,7 +768,7 @@ diff -u openssl/crypto/engine/engine.h:1.4.6.1 openssl/crypto/engine/engine.h:1.
* "registry" handling. */
Index: openssl/crypto/engine/hw_pk11.c
diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.26.4.2
--- /dev/null Mon Jan 16 18:53:42 2012
--- /dev/null Tue Jun 19 16:24:30 2012
+++ openssl/crypto/engine/hw_pk11.c Thu Jun 16 12:31:35 2011
@@ -0,0 +1,4057 @@
+/*
......@@ -4830,7 +4830,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.26.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.4.10.1
--- /dev/null Mon Jan 16 18:53:42 2012
--- /dev/null Tue Jun 19 16:24:30 2012
+++ openssl/crypto/engine/hw_pk11_err.c Tue Jun 14 21:52:40 2011
@@ -0,0 +1,288 @@
+/*
......@@ -5123,7 +5123,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.1
--- /dev/null Mon Jan 16 18:53:42 2012
--- /dev/null Tue Jun 19 16:24:30 2012
+++ openssl/crypto/engine/hw_pk11_err.h Tue Jun 14 21:52:40 2011
@@ -0,0 +1,440 @@
+/*
......@@ -5567,9 +5567,9 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.9.10.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.32.4.3
--- /dev/null Mon Jan 16 18:53:42 2012
+++ openssl/crypto/engine/hw_pk11_pub.c Fri Jun 17 07:56:20 2011
diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.32.4.4
--- /dev/null Tue Jun 19 16:24:30 2012
+++ openssl/crypto/engine/hw_pk11_pub.c Sun Jun 17 21:12:10 2012
@@ -0,0 +1,3530 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
......@@ -8821,20 +8821,20 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.32.4.3
+ goto err;
+ }
+
+ (void) pFuncList->C_FindObjectsFinal(s);
+ UNLOCK_OBJSTORE(op);
+
+ if (objcnt > 1)
+ {
+ PK11err(PK11_F_FIND_ONE_OBJECT,
+ PK11_R_MORE_THAN_ONE_OBJECT_FOUND);
+ goto err;
+ return (0);
+ }
+ else if (objcnt == 0)
+ {
+ PK11err(PK11_F_FIND_ONE_OBJECT, PK11_R_NO_OBJECT_FOUND);
+ goto err;
+ return (0);
+ }
+
+ (void) pFuncList->C_FindObjectsFinal(s);
+ UNLOCK_OBJSTORE(op);
+ return (1);
+err:
+ UNLOCK_OBJSTORE(op);
......@@ -9103,7 +9103,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.32.4.3
+#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 Mon Jan 16 18:53:42 2012
--- /dev/null Tue Jun 19 16:24:30 2012
+++ 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 */
......@@ -9140,7 +9140,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.2
--- /dev/null Mon Jan 16 18:53:42 2012
--- /dev/null Tue Jun 19 16:24:30 2012
+++ openssl/crypto/engine/hw_pk11so.c Thu Jun 16 12:31:35 2011
@@ -0,0 +1,1745 @@
+/*
......@@ -10890,7 +10890,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.3.4.2
+#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 Mon Jan 16 18:53:42 2012
--- /dev/null Tue Jun 19 16:24:30 2012
+++ 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 */
......@@ -10926,9 +10926,9 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.2.4.2
+#define pk11_pin pk11so_pin
+#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.3
--- /dev/null Mon Jan 16 18:53:42 2012
+++ openssl/crypto/engine/hw_pk11so_pub.c Fri Jun 17 07:56:21 2011
diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.2.4.4
--- /dev/null Tue Jun 19 16:24:30 2012
+++ openssl/crypto/engine/hw_pk11so_pub.c Sun Jun 17 21:12:11 2012
@@ -0,0 +1,1622 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
......@@ -12272,20 +12272,20 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.2.4.3
+ goto err;
+ }
+
+ (void) pFuncList->C_FindObjectsFinal(s);
+ UNLOCK_OBJSTORE(op);
+
+ if (objcnt > 1)
+ {
+ PK11err(PK11_F_FIND_ONE_OBJECT,
+ PK11_R_MORE_THAN_ONE_OBJECT_FOUND);
+ goto err;
+ return (0);
+ }
+ else if (objcnt == 0)
+ {
+ PK11err(PK11_F_FIND_ONE_OBJECT, PK11_R_NO_OBJECT_FOUND);
+ goto err;
+ return (0);
+ }
+
+ (void) pFuncList->C_FindObjectsFinal(s);
+ UNLOCK_OBJSTORE(op);
+ return (1);
+err:
+ UNLOCK_OBJSTORE(op);
......@@ -12554,11 +12554,11 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.2.4.3
+#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 Mon Jan 16 18:53:42 2012
--- /dev/null Tue Jun 19 16:24:30 2012
+++ 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.3 $ */
+/* $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
......@@ -12858,11 +12858,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 Mon Jan 16 18:53:42 2012
--- /dev/null Tue Jun 19 16:24:30 2012
+++ 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.3 $ */
+/* $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
......@@ -13775,11 +13775,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 Mon Jan 16 18:53:42 2012
--- /dev/null Tue Jun 19 16:24:30 2012
+++ 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.3 $ */
+/* $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
......@@ -15754,9 +15754,9 @@ diff -u openssl/util/mkdef.pl:1.6.6.1 openssl/util/mkdef.pl:1.6
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.6.6.1 openssl/util/pl/VC-32.pl:1.6
--- openssl/util/pl/VC-32.pl:1.6.6.1 Sun Jan 15 15:45:41 2012
+++ openssl/util/pl/VC-32.pl Mon Jun 13 14:25:26 2011
diff -u openssl/util/pl/VC-32.pl:1.6.6.1.2.1 openssl/util/pl/VC-32.pl:1.6.2.1
--- openssl/util/pl/VC-32.pl:1.6.6.1.2.1 Tue Jun 19 14:58:52 2012
+++ openssl/util/pl/VC-32.pl Tue Jun 19 15:00:09 2012
@@ -52,7 +52,7 @@
my $f = $shlib || $fips ?' /MD':' /MT';
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
......
Index: openssl/Configure
diff -u openssl/Configure:1.9.2.1 openssl/Configure:1.10
--- openssl/Configure:1.9.2.1 Sun Jan 15 16:09:40 2012
+++ openssl/Configure Sun Jan 15 16:30:04 2012
diff -u openssl/Configure:1.9.2.1.2.1 openssl/Configure:1.11
--- openssl/Configure:1.9.2.1.2.1 Tue Jun 19 14:46:03 2012
+++ openssl/Configure Tue Jun 19 14:49:21 2012
@@ -10,7 +10,7 @@
# see INSTALL for instructions.
......@@ -91,7 +91,7 @@ diff -u openssl/Configure:1.9.2.1 openssl/Configure:1.10
if ($target =~ m/^CygWin32(-.*)$/) {
$target = "Cygwin".$1;
}
@@ -1036,6 +1070,25 @@
@@ -1038,6 +1072,25 @@
$exp_cflags .= " -DOPENSSL_EXPERIMENTAL_$ALGO";
}
......@@ -117,7 +117,7 @@ diff -u openssl/Configure:1.9.2.1 openssl/Configure:1.10
my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/);
@@ -1123,6 +1176,8 @@
@@ -1125,6 +1178,8 @@
if ($flags ne "") { $cflags="$flags$cflags"; }
else { $no_user_cflags=1; }
......@@ -126,7 +126,7 @@ diff -u openssl/Configure:1.9.2.1 openssl/Configure:1.10
# Kerberos settings. The flavor must be provided from outside, either through
# the script "config" or manually.
if (!$no_krb5)
@@ -1492,6 +1547,7 @@
@@ -1494,6 +1549,7 @@
s/^VERSION=.*/VERSION=$version/;
s/^MAJOR=.*/MAJOR=$major/;
s/^MINOR=.*/MINOR=$minor/;
......@@ -135,9 +135,9 @@ diff -u openssl/Configure:1.9.2.1 openssl/Configure:1.10
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 openssl/Makefile.org:1.5
--- openssl/Makefile.org:1.5.2.1 Sun Jan 15 16:09:41 2012
+++ openssl/Makefile.org Mon Jun 13 17:13:25 2011
diff -u openssl/Makefile.org:1.5.2.1.2.1 openssl/Makefile.org:1.6
--- openssl/Makefile.org:1.5.2.1.2.1 Tue Jun 19 14:46:04 2012
+++ openssl/Makefile.org Tue Jun 19 14:49:21 2012
@@ -26,6 +26,9 @@
INSTALL_PREFIX=
INSTALLTOP=/usr/local/ssl
......@@ -150,7 +150,7 @@ diff -u openssl/Makefile.org:1.5.2.1 openssl/Makefile.org:1.5
Index: openssl/README.pkcs11
diff -u /dev/null openssl/README.pkcs11:1.7
--- /dev/null Mon Jan 16 18:54:22 2012
--- /dev/null Tue Jun 19 16:23:56 2012
+++ openssl/README.pkcs11 Mon Jun 13 18:27:17 2011
@@ -0,0 +1,261 @@
+ISC modified
......@@ -605,7 +605,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 Mon Jan 16 18:54:23 2012
--- /dev/null Tue Jun 19 16:23:56 2012
+++ openssl/crypto/engine/cryptoki.h Thu Dec 18 00:14:12 2008
@@ -0,0 +1,103 @@
+/*
......@@ -749,7 +749,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
--- /dev/null Mon Jan 16 18:54:23 2012
--- /dev/null Tue Jun 19 16:23:56 2012
+++ openssl/crypto/engine/hw_pk11.c Thu Jun 16 12:31:53 2011
@@ -0,0 +1,4057 @@
+/*
......@@ -4811,7 +4811,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11.c:1.30
+#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 Mon Jan 16 18:54:23 2012
--- /dev/null Tue Jun 19 16:23:56 2012
+++ openssl/crypto/engine/hw_pk11_err.c Tue Jun 14 00:43:26 2011
@@ -0,0 +1,288 @@
+/*
......@@ -5104,7 +5104,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
--- /dev/null Mon Jan 16 18:54:23 2012
--- /dev/null Tue Jun 19 16:23:57 2012
+++ openssl/crypto/engine/hw_pk11_err.h Tue Jun 14 21:51:32 2011
@@ -0,0 +1,440 @@
+/*
......@@ -5548,9 +5548,9 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_err.h:1.12
+
+#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.37
--- /dev/null Mon Jan 16 18:54:23 2012
+++ openssl/crypto/engine/hw_pk11_pub.c Fri Jun 17 07:55:25 2011
diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.38
--- /dev/null Tue Jun 19 16:23:57 2012
+++ openssl/crypto/engine/hw_pk11_pub.c Sun Jun 17 21:12:24 2012
@@ -0,0 +1,3530 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
......@@ -8802,20 +8802,20 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.37
+ goto err;
+ }
+
+ (void) pFuncList->C_FindObjectsFinal(s);
+ UNLOCK_OBJSTORE(op);
+
+ if (objcnt > 1)
+ {
+ PK11err(PK11_F_FIND_ONE_OBJECT,
+ PK11_R_MORE_THAN_ONE_OBJECT_FOUND);
+ goto err;
+ return (0);
+ }
+ else if (objcnt == 0)
+ {
+ PK11err(PK11_F_FIND_ONE_OBJECT, PK11_R_NO_OBJECT_FOUND);
+ goto err;
+ return (0);
+ }
+
+ (void) pFuncList->C_FindObjectsFinal(s);
+ UNLOCK_OBJSTORE(op);
+ return (1);
+err:
+ UNLOCK_OBJSTORE(op);
......@@ -9084,7 +9084,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11_pub.c:1.37
+#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 Mon Jan 16 18:54:23 2012
--- /dev/null Tue Jun 19 16:23:57 2012
+++ 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 */
......@@ -9121,7 +9121,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
--- /dev/null Mon Jan 16 18:54:23 2012
--- /dev/null Tue Jun 19 16:23:57 2012
+++ openssl/crypto/engine/hw_pk11so.c Thu Jun 16 12:31:53 2011
@@ -0,0 +1,1745 @@
+/*
......@@ -10871,7 +10871,7 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.c:1.7
+#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 Mon Jan 16 18:54:23 2012
--- /dev/null Tue Jun 19 16:23:57 2012
+++ 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 */
......@@ -10907,9 +10907,9 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so.h:1.4
+#define pk11_pin pk11so_pin
+#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.7
--- /dev/null Mon Jan 16 18:54:23 2012
+++ openssl/crypto/engine/hw_pk11so_pub.c Fri Jun 17 07:55:25 2011
diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.8
--- /dev/null Tue Jun 19 16:23:57 2012
+++ openssl/crypto/engine/hw_pk11so_pub.c Sun Jun 17 21:12:24 2012
@@ -0,0 +1,1622 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
......@@ -12253,20 +12253,20 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.7
+ goto err;
+ }
+
+ (void) pFuncList->C_FindObjectsFinal(s);
+ UNLOCK_OBJSTORE(op);
+
+ if (objcnt > 1)
+ {
+ PK11err(PK11_F_FIND_ONE_OBJECT,
+ PK11_R_MORE_THAN_ONE_OBJECT_FOUND);
+ goto err;
+ return (0);
+ }
+ else if (objcnt == 0)
+ {
+ PK11err(PK11_F_FIND_ONE_OBJECT, PK11_R_NO_OBJECT_FOUND);
+ goto err;
+ return (0);
+ }
+
+ (void) pFuncList->C_FindObjectsFinal(s);
+ UNLOCK_OBJSTORE(op);
+ return (1);
+err:
+ UNLOCK_OBJSTORE(op);
......@@ -12535,11 +12535,11 @@ diff -u /dev/null openssl/crypto/engine/hw_pk11so_pub.c:1.7
+#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 Mon Jan 16 18:54:23 2012
--- /dev/null Tue Jun 19 16:23:57 2012
+++ 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.2 $ */
+/* $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
......@@ -12839,11 +12839,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 Mon Jan 16 18:54:23 2012
--- /dev/null Tue Jun 19 16:23:57 2012
+++ 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.2 $ */
+/* $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
......@@ -13756,7 +13756,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 Mon Jan 16 18:54:23 2012
--- /dev/null Tue Jun 19 16:23:57 2012
+++ openssl/crypto/engine/pkcs11t.h Sat Aug 30 11:58:07 2008
@@ -0,0 +1,1885 @@
+/* pkcs11t.h include file for PKCS #11. */
......@@ -15644,46 +15644,6 @@ diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2
+typedef CK_ARIA_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_ARIA_CBC_ENCRYPT_DATA_PARAMS_PTR;
+
+#endif
Index: openssl/test/clean_test.com
diff -u openssl/test/clean_test.com:1.1.2.1 openssl/test/clean_test.com:removed
--- openssl/test/clean_test.com:1.1.2.1 Sun Jan 15 16:09:50 2012
+++ openssl/test/clean_test.com Mon Jan 16 18:54:23 2012
@@ -1,35 +0,0 @@
-$!
-$! Delete various test results files.
-$!
-$ def_orig = f$environment( "default")
-$ proc = f$environment( "procedure")
-$ proc_dev_dir = f$parse( "A.;", proc) - "A.;"
-$!
-$ on control_c then goto tidy
-$ on error then goto tidy
-$!
-$ set default 'proc_dev_dir'
-$!
-$ files := *.cms;*, *.srl;*, *.ss;*, -
- cms.err;*, cms.out;*, newreq.pem;*, -
- p.txt-zlib-cipher;*, -
- smtst.txt;*, testkey.pem;*, testreq.pem;*, -
- test_*.err;*, test_*.out;*, -
- .rnd;*
-$!
-$ delim = ","
-$ i = 0
-$ loop:
-$ file = f$edit( f$element( i, delim, files), "trim")
-$ if (file .eqs. delim) then goto loop_end
-$ if (f$search( file) .nes. "") then -
- delete 'p1' 'file'
-$ i = i+ 1
-$ goto loop
-$ loop_end:
-$!
-$ tidy:
-$
-$ if (f$type( def_orig) .nes. "") then -
- set default 'def_orig'
-$!
Index: openssl/util/libeay.num
diff -u openssl/util/libeay.num:1.8.2.1 openssl/util/libeay.num:1.9
--- openssl/util/libeay.num:1.8.2.1 Sun Jan 15 16:09:52 2012
......
This diff is collapsed.
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