diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-09-28 08:23:39 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-09-28 08:23:39 +0000 |
| commit | fabce29e33a10fd120e346a9581acf81b21bf644 (patch) | |
| tree | 179da039681827d00584da6605100641e241d1d5 /security/nss/files/patch-lib_softoken_pkcs11c.c | |
| parent | Fix integer overflow in gdImageWebpCtx and bump PORTREVISION. (diff) | |
security/nss: update to 3.27
Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.27_release_notes
Notes
Notes:
svn path=/head/; revision=422859
Diffstat (limited to 'security/nss/files/patch-lib_softoken_pkcs11c.c')
| -rw-r--r-- | security/nss/files/patch-lib_softoken_pkcs11c.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/security/nss/files/patch-lib_softoken_pkcs11c.c b/security/nss/files/patch-lib_softoken_pkcs11c.c index 8d65974a633a..7bb450ba5220 100644 --- a/security/nss/files/patch-lib_softoken_pkcs11c.c +++ b/security/nss/files/patch-lib_softoken_pkcs11c.c @@ -1,22 +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; +@@ -5679,9 +5679,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, S + 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 + 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) +@@ -5722,9 +5719,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, S + #ifndef NSS_DISABLE_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; + 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) |