SF.net SVN: gar:[22968] csw/mgar/pkg/openssl1/trunk/files
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Fri Feb 7 21:38:12 CET 2014
Revision: 22968
http://sourceforge.net/p/gar/code/22968
Author: chninkel
Date: 2014-02-07 20:38:11 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
openssl1/trunk: updated pkcs11 engine patch
Modified Paths:
--------------
csw/mgar/pkg/openssl1/trunk/files/changelog.CSW
csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2014-02-07 20:34:33 UTC (rev 22967)
+++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2014-02-07 20:38:11 UTC (rev 22968)
@@ -1,6 +1,7 @@
openssl (1.0.1f,rev=2014.02.07) unstable
* Manpages and html doc are back in the package !
+ * Updated pkcs11 engine patch.
-- yann rouillard <yann at opencsw.org> Fri, 07 Feb 2014 20:48:46 +0100
Modified: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch 2014-02-07 20:34:33 UTC (rev 22967)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch 2014-02-07 20:38:11 UTC (rev 22968)
@@ -196,10 +196,10 @@
===================================================================
diff -uNr openssl-1.0.1f/engines/e_pk11.c openssl-1.0.1f/engines/e_pk11.c
--- openssl-1.0.1f/engines/e_pk11.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11.c 2014-01-25 13:25:24.018899108 +0100
-@@ -0,0 +1,3710 @@
++++ openssl-1.0.1f/engines/e_pk11.c 2014-02-07 21:35:52.%N +0100
+@@ -0,0 +1,3713 @@
+/*
-+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ */
+
+/* crypto/engine/e_pk11.c */
@@ -3299,8 +3299,10 @@
+ pk11_choose_pubkey_slot(mech_info, token_info, current_slot,
+ rv, best_number_of_mechs, best_pubkey_slot_sofar);
+
-+ pk11_choose_cipher_digest(&local_cipher_nids,
-+ &local_digest_nids, pFuncList, current_slot);
++ (void) memset(local_cipher_nids, 0, sizeof (local_cipher_nids));
++ (void) memset(local_digest_nids, 0, sizeof (local_digest_nids));
++ pk11_choose_cipher_digest(local_cipher_nids,
++ local_digest_nids, pFuncList, current_slot);
+ }
+
+ if (best_number_of_mechs == 0)
@@ -3449,9 +3451,6 @@
+
+ DEBUG_SLOT_SEL("%s: checking cipher/digest\n", PK11_DBG);
+
-+ (void) memset(local_cipher_nids, 0, sizeof (local_cipher_nids));
-+ (void) memset(local_digest_nids, 0, sizeof (local_digest_nids));
-+
+ pk11_find_symmetric_ciphers(pFuncList, current_slot,
+ ¤t_slot_n_cipher, local_cipher_nids);
+
@@ -3475,10 +3474,12 @@
+ SLOTID = current_slot;
+ cipher_count = current_slot_n_cipher;
+ digest_count = current_slot_n_digest;
++ OPENSSL_assert(cipher_count <= PK11_CIPHER_MAX);
++ OPENSSL_assert(digest_count <= PK11_DIGEST_MAX);
+ (void) memcpy(cipher_nids, local_cipher_nids,
-+ sizeof (local_cipher_nids));
++ sizeof (int) * cipher_count);
+ (void) memcpy(digest_nids, local_digest_nids,
-+ sizeof (local_digest_nids));
++ sizeof (int) * digest_count);
+ }
+ }
+
@@ -3490,6 +3491,8 @@
+ static CK_RV rv;
+ static CK_MECHANISM_TYPE last_checked_mech = (CK_MECHANISM_TYPE)-1;
+
++ OPENSSL_assert(cipher->mech_type != (CK_MECHANISM_TYPE)-1);
++
+ DEBUG_SLOT_SEL("%s: checking mech: %x", PK11_DBG, cipher->mech_type);
+ if (cipher->mech_type != last_checked_mech)
+ {
@@ -3912,7 +3915,7 @@
===================================================================
diff -uNr openssl-1.0.1f/engines/e_pk11.h openssl-1.0.1f/engines/e_pk11.h
--- openssl-1.0.1f/engines/e_pk11.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11.h 2014-01-25 13:25:24.018899108 +0100
++++ openssl-1.0.1f/engines/e_pk11.h 2014-02-07 21:35:52.%N +0100
@@ -0,0 +1,257 @@
+/*
+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4175,7 +4178,7 @@
===================================================================
diff -uNr openssl-1.0.1f/engines/e_pk11_err.c openssl-1.0.1f/engines/e_pk11_err.c
--- openssl-1.0.1f/engines/e_pk11_err.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_err.c 2014-01-25 13:25:24.018899108 +0100
++++ openssl-1.0.1f/engines/e_pk11_err.c 2014-02-07 21:35:52.%N +0100
@@ -0,0 +1,306 @@
+/*
+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4487,7 +4490,7 @@
===================================================================
diff -uNr openssl-1.0.1f/engines/e_pk11_err.h openssl-1.0.1f/engines/e_pk11_err.h
--- openssl-1.0.1f/engines/e_pk11_err.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_err.h 2014-01-25 13:25:24.018899108 +0100
++++ openssl-1.0.1f/engines/e_pk11_err.h 2014-02-07 21:35:52.%N +0100
@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4735,7 +4738,7 @@
===================================================================
diff -uNr openssl-1.0.1f/engines/e_pk11_pub.c openssl-1.0.1f/engines/e_pk11_pub.c
--- openssl-1.0.1f/engines/e_pk11_pub.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_pub.c 2014-01-25 13:25:24.018899108 +0100
++++ openssl-1.0.1f/engines/e_pk11_pub.c 2014-02-07 21:35:52.%N +0100
@@ -0,0 +1,3273 @@
+/*
+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8014,7 +8017,7 @@
===================================================================
diff -uNr openssl-1.0.1f/engines/e_pk11_uri.c openssl-1.0.1f/engines/e_pk11_uri.c
--- openssl-1.0.1f/engines/e_pk11_uri.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_uri.c 2014-01-25 13:25:24.018899108 +0100
++++ openssl-1.0.1f/engines/e_pk11_uri.c 2014-02-07 21:35:52.%N +0100
@@ -0,0 +1,869 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8889,7 +8892,7 @@
===================================================================
diff -uNr openssl-1.0.1f/engines/e_pk11_uri.h openssl-1.0.1f/engines/e_pk11_uri.h
--- openssl-1.0.1f/engines/e_pk11_uri.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_uri.h 2014-01-25 13:25:24.018899108 +0100
++++ openssl-1.0.1f/engines/e_pk11_uri.h 2014-02-07 21:35:52.%N +0100
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list