diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2018-09-09 18:27:42 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2018-09-09 18:27:42 +0000 |
| commit | 57605e2424af65960e9fccca186e869e72c7e56f (patch) | |
| tree | 08aa5528afdefe726d61860b9f896c3c1f481683 /security/nss/files/patch-lib_softoken_pkcs11c.c | |
| parent | devel/nspr: regen patches (diff) | |
security/nss: regen patches
Only BSD patch(1) warns about the following:
No such line 52 in input file, ignoring
No such line -11 in input file, ignoring
No such line 118 in input file, ignoring
https://svnweb.freebsd.org/changeset/base/253689
Reported by: sunpoet
Notes
Notes:
svn path=/head/; revision=479329
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 7bb450ba5220..939bd87d241d 100644 --- a/security/nss/files/patch-lib_softoken_pkcs11c.c +++ b/security/nss/files/patch-lib_softoken_pkcs11c.c @@ -1,6 +1,6 @@ ---- 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 -@@ -5679,9 +5679,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, S +--- lib/softoken/pkcs11c.c.orig 2018-08-31 12:55:53 UTC ++++ lib/softoken/pkcs11c.c +@@ -5772,9 +5772,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki) break; case NSSLOWKEYDSAKey: keyType = CKK_DSA; @@ -10,8 +10,8 @@ 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 +@@ -5814,9 +5811,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; |