diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2020-05-02 00:54:30 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2020-05-02 00:54:30 +0000 |
| commit | 9cd0a807cf46e524953f5f30e681aee4befdc982 (patch) | |
| tree | 0fc4e47a4409d42d4570bac11e8bebe0562e72ab /security/nss/files/patch-lib_softoken_pkcs11c.c | |
| parent | multimedia/aom: update to 1.0.0.3596 (diff) | |
security/nss: update to 3.52
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/
Notes
Notes:
svn path=/head/; revision=533597
Diffstat (limited to 'security/nss/files/patch-lib_softoken_pkcs11c.c')
| -rw-r--r-- | security/nss/files/patch-lib_softoken_pkcs11c.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/security/nss/files/patch-lib_softoken_pkcs11c.c b/security/nss/files/patch-lib_softoken_pkcs11c.c index 939bd87d241d..5acfe3f87c7b 100644 --- a/security/nss/files/patch-lib_softoken_pkcs11c.c +++ b/security/nss/files/patch-lib_softoken_pkcs11c.c @@ -1,20 +1,20 @@ ---- lib/softoken/pkcs11c.c.orig 2018-08-31 12:55:53 UTC +--- lib/softoken/pkcs11c.c.orig 2020-05-01 21:08:55 UTC +++ lib/softoken/pkcs11c.c -@@ -5772,9 +5772,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki) +@@ -6106,9 +6106,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki) break; case NSSLOWKEYDSAKey: keyType = CKK_DSA; -- crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT; +- 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) -@@ -5814,9 +5811,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki) +@@ -6148,9 +6145,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki) /* what about fortezza??? */ case NSSLOWKEYECKey: keyType = CKK_EC; -- crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT; +- 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, |