Index: patches/nss-remove-fortezza.patch |
diff --git a/patches/nss-remove-fortezza.patch b/patches/nss-remove-fortezza.patch |
deleted file mode 100644 |
index a1e7607058020f51ec868eb8eff8ff1543927c21..0000000000000000000000000000000000000000 |
--- a/patches/nss-remove-fortezza.patch |
+++ /dev/null |
@@ -1,36 +0,0 @@ |
-diff --git a/lib/pk11wrap/pk11akey.c b/lib/pk11wrap/pk11akey.c |
-index b0604de..6fbfcbb 100644 |
---- a/lib/pk11wrap/pk11akey.c |
-+++ b/lib/pk11wrap/pk11akey.c |
-@@ -135,20 +135,6 @@ PK11_ImportPublicKey(PK11SlotInfo *slot, SECKEYPublicKey *pubKey, |
- PK11_SETATTRS(attrs, CKA_VALUE, pubKey->u.dsa.publicValue.data, |
- pubKey->u.dsa.publicValue.len); attrs++; |
- break; |
-- case fortezzaKey: |
-- keyType = CKK_DSA; |
-- PK11_SETATTRS(attrs, CKA_VERIFY, &cktrue, sizeof(CK_BBOOL));attrs++; |
-- signedattr = attrs; |
-- PK11_SETATTRS(attrs, CKA_PRIME,pubKey->u.fortezza.params.prime.data, |
-- pubKey->u.fortezza.params.prime.len); attrs++; |
-- PK11_SETATTRS(attrs,CKA_SUBPRIME, |
-- pubKey->u.fortezza.params.subPrime.data, |
-- pubKey->u.fortezza.params.subPrime.len);attrs++; |
-- PK11_SETATTRS(attrs, CKA_BASE, pubKey->u.fortezza.params.base.data, |
-- pubKey->u.fortezza.params.base.len); attrs++; |
-- PK11_SETATTRS(attrs, CKA_VALUE, pubKey->u.fortezza.DSSKey.data, |
-- pubKey->u.fortezza.DSSKey.len); attrs++; |
-- break; |
- case dhKey: |
- keyType = CKK_DH; |
- PK11_SETATTRS(attrs, CKA_DERIVE, &cktrue, sizeof(CK_BBOOL));attrs++; |
-@@ -209,6 +195,10 @@ PK11_ImportPublicKey(PK11SlotInfo *slot, SECKEYPublicKey *pubKey, |
- SECITEM_FreeItem(pubValue,PR_TRUE); |
- } |
- if ( rv != SECSuccess) { |
-+ /* CKR_ATTRIBUTE_VALUE_INVALID is mapped to SEC_ERROR_BAD_DATA */ |
-+ if (PORT_GetError() == SEC_ERROR_BAD_DATA) { |
-+ PORT_SetError( SEC_ERROR_BAD_KEY ); |
-+ } |
- return CK_INVALID_HANDLE; |
- } |
- } |