diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2010-05-20 10:01:55 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2010-05-20 10:01:55 +0000 |
| commit | 7dde1715ae5dc5f15b4fc1c1c9489f7e4caff23f (patch) | |
| tree | b86dddae05eb7e96f94ca64acdda0ea1771cd03b /security/nss/files/patch-lib_softoken_pkcs11c.c | |
| parent | The massXpert project aims at providing (bio)chemists with a software (diff) | |
A bunch of changes for the SQLITE3 backend:
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
Notes
Notes:
svn path=/head/; revision=254639
Diffstat (limited to 'security/nss/files/patch-lib_softoken_pkcs11c.c')
| -rw-r--r-- | security/nss/files/patch-lib_softoken_pkcs11c.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/security/nss/files/patch-lib_softoken_pkcs11c.c b/security/nss/files/patch-lib_softoken_pkcs11c.c new file mode 100644 index 000000000000..8d65974a633a --- /dev/null +++ b/security/nss/files/patch-lib_softoken_pkcs11c.c @@ -0,0 +1,22 @@ +--- 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; |