OLD | NEW |
| (Empty) |
1 diff --git a/lib/pk11wrap/pk11akey.c b/lib/pk11wrap/pk11akey.c | |
2 index b0604de..6fbfcbb 100644 | |
3 --- a/lib/pk11wrap/pk11akey.c | |
4 +++ b/lib/pk11wrap/pk11akey.c | |
5 @@ -135,20 +135,6 @@ PK11_ImportPublicKey(PK11SlotInfo *slot, SECKEYPublicKey *p
ubKey, | |
6 PK11_SETATTRS(attrs, CKA_VALUE, pubKey->u.dsa.publicValue.data, | |
7 pubKey->u.dsa.publicValue.len); attrs++; | |
8 break; | |
9 - case fortezzaKey: | |
10 - keyType = CKK_DSA; | |
11 - PK11_SETATTRS(attrs, CKA_VERIFY, &cktrue, sizeof(CK_BBOOL));attrs++; | |
12 - signedattr = attrs; | |
13 - PK11_SETATTRS(attrs, CKA_PRIME,pubKey->u.fortezza.params.prime.data, | |
14 - pubKey->u.fortezza.params.prime.len); attrs++; | |
15 - PK11_SETATTRS(attrs,CKA_SUBPRIME, | |
16 - pubKey->u.fortezza.params.subPrime.data, | |
17 - pubKey->u.fortezza.params.subPrime.len);attrs++; | |
18 - PK11_SETATTRS(attrs, CKA_BASE, pubKey->u.fortezza.params.base.data, | |
19 - pubKey->u.fortezza.params.base.len); attrs++; | |
20 - PK11_SETATTRS(attrs, CKA_VALUE, pubKey->u.fortezza.DSSKey.data, | |
21 - pubKey->u.fortezza.DSSKey.len); attrs++; | |
22 - break; | |
23 case dhKey: | |
24 keyType = CKK_DH; | |
25 PK11_SETATTRS(attrs, CKA_DERIVE, &cktrue, sizeof(CK_BBOOL));attrs++; | |
26 @@ -209,6 +195,10 @@ PK11_ImportPublicKey(PK11SlotInfo *slot, SECKEYPublicKey *p
ubKey, | |
27 SECITEM_FreeItem(pubValue,PR_TRUE); | |
28 } | |
29 if ( rv != SECSuccess) { | |
30 + /* CKR_ATTRIBUTE_VALUE_INVALID is mapped to SEC_ERROR_BAD_DATA */ | |
31 + if (PORT_GetError() == SEC_ERROR_BAD_DATA) { | |
32 + PORT_SetError( SEC_ERROR_BAD_KEY ); | |
33 + } | |
34 return CK_INVALID_HANDLE; | |
35 } | |
36 } | |
OLD | NEW |