mirror of
https://git.freebsd.org/ports.git
synced 2025-05-29 09:26:27 -04:00
9cd0a807cf
Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.52_release_notes Changes: https://hg.mozilla.org/projects/nss/shortlog/NSS_3_52_RTM ABI: https://abi-laboratory.pro/tracker/timeline/nss/
22 lines
1 KiB
C
22 lines
1 KiB
C
--- lib/softoken/pkcs11c.c.orig 2020-05-01 21:08:55 UTC
|
|
+++ lib/softoken/pkcs11c.c
|
|
@@ -6106,9 +6106,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki)
|
|
break;
|
|
case NSSLOWKEYDSAKey:
|
|
keyType = CKK_DSA;
|
|
- crv = (sftk_hasAttribute(key, CKA_NSS_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)
|
|
@@ -6148,9 +6145,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki)
|
|
/* what about fortezza??? */
|
|
case NSSLOWKEYECKey:
|
|
keyType = CKK_EC;
|
|
- crv = (sftk_hasAttribute(key, CKA_NSS_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)
|