mirror of
https://git.freebsd.org/ports.git
synced 2025-05-28 17:06:32 -04:00
7dde1715ae
1) fix for bug #528467 (C_UnwrapKey didn't work with DSA and EC private keys) 2) fix for bug #526231 (C_GetAttributeValue didn't correctly work) 3) partial fix for bug #564011 (object ID race on keypairgen) 4) use sqlite3 in ports (there is no reason to compile the bundled one) Approved by: no objections by marcus and gnome team
22 lines
821 B
C
22 lines
821 B
C
--- lib/softoken/pkcs11c.c.orig 2010-05-05 14:36:05.000000000 +0000
|
|
+++ lib/softoken/pkcs11c.c 2010-05-05 14:37:25.000000000 +0000
|
|
@@ -4602,9 +4602,6 @@
|
|
break;
|
|
case NSSLOWKEYDSAKey:
|
|
keyType = CKK_DSA;
|
|
- crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK :
|
|
- CKR_KEY_TYPE_INCONSISTENT;
|
|
- if(crv != CKR_OK) break;
|
|
crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType,
|
|
sizeof(keyType));
|
|
if(crv != CKR_OK) break;
|
|
@@ -4638,9 +4635,6 @@
|
|
#ifdef NSS_ENABLE_ECC
|
|
case NSSLOWKEYECKey:
|
|
keyType = CKK_EC;
|
|
- crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK :
|
|
- CKR_KEY_TYPE_INCONSISTENT;
|
|
- if(crv != CKR_OK) break;
|
|
crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType,
|
|
sizeof(keyType));
|
|
if(crv != CKR_OK) break;
|