57605e2424
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
23 lines
1.0 KiB
C
23 lines
1.0 KiB
C
--- 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;
|
|
- 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)
|
|
@@ -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;
|
|
- if (crv != CKR_OK)
|
|
- break;
|
|
crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType,
|
|
sizeof(keyType));
|
|
if (crv != CKR_OK)
|