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