Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Side by Side Diff: patches/nss-remove-fortezza.patch

Issue 13898013: Update NSS to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Update NSS versions and tag in README.chromium Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 Index: mozilla/security/nss/lib/pk11wrap/pk11akey.c 1 diff -r 3f0105dfc733 lib/pk11wrap/pk11akey.c
2 =================================================================== 2 --- a/lib/pk11wrap/pk11akey.c» Mon Apr 22 14:22:48 2013 +0200
3 RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11akey.c,v 3 +++ b/lib/pk11wrap/pk11akey.c» Mon Apr 22 14:41:49 2013 -0700
4 retrieving revision 1.30 4 @@ -136,20 +136,6 @@
5 diff -p -u -r1.30 pk11akey.c
6 --- mozilla/security/nss/lib/pk11wrap/pk11akey.c» 17 Jun 2010 20:36:37 -00 00» 1.30
7 +++ mozilla/security/nss/lib/pk11wrap/pk11akey.c» 22 Jul 2011 20:57:00 -00 00
8 @@ -171,20 +171,6 @@ PK11_ImportPublicKey(PK11SlotInfo *slot,
9 PK11_SETATTRS(attrs, CKA_VALUE, pubKey->u.dsa.publicValue.data, 5 PK11_SETATTRS(attrs, CKA_VALUE, pubKey->u.dsa.publicValue.data,
10 pubKey->u.dsa.publicValue.len); attrs++; 6 pubKey->u.dsa.publicValue.len); attrs++;
11 break; 7 break;
12 - case fortezzaKey: 8 - case fortezzaKey:
13 - keyType = CKK_DSA; 9 - keyType = CKK_DSA;
14 - PK11_SETATTRS(attrs, CKA_VERIFY, &cktrue, sizeof(CK_BBOOL));attrs++; 10 - PK11_SETATTRS(attrs, CKA_VERIFY, &cktrue, sizeof(CK_BBOOL));attrs++;
15 - signedattr = attrs; 11 - signedattr = attrs;
16 - PK11_SETATTRS(attrs, CKA_PRIME,pubKey->u.fortezza.params.prime.data, 12 - PK11_SETATTRS(attrs, CKA_PRIME,pubKey->u.fortezza.params.prime.data,
17 - pubKey->u.fortezza.params.prime.len); attrs++; 13 - pubKey->u.fortezza.params.prime.len); attrs++;
18 - PK11_SETATTRS(attrs,CKA_SUBPRIME, 14 - PK11_SETATTRS(attrs,CKA_SUBPRIME,
19 - pubKey->u.fortezza.params.subPrime.data, 15 - pubKey->u.fortezza.params.subPrime.data,
20 - pubKey->u.fortezza.params.subPrime.len);attrs++; 16 - pubKey->u.fortezza.params.subPrime.len);attrs++;
21 - PK11_SETATTRS(attrs, CKA_BASE, pubKey->u.fortezza.params.base.data, 17 - PK11_SETATTRS(attrs, CKA_BASE, pubKey->u.fortezza.params.base.data,
22 - pubKey->u.fortezza.params.base.len); attrs++; 18 - pubKey->u.fortezza.params.base.len); attrs++;
23 - PK11_SETATTRS(attrs, CKA_VALUE, pubKey->u.fortezza.DSSKey.data, 19 - PK11_SETATTRS(attrs, CKA_VALUE, pubKey->u.fortezza.DSSKey.data,
24 - pubKey->u.fortezza.DSSKey.len); attrs++; 20 - pubKey->u.fortezza.DSSKey.len); attrs++;
25 - break; 21 - break;
26 case dhKey: 22 case dhKey:
27 keyType = CKK_DH; 23 keyType = CKK_DH;
28 PK11_SETATTRS(attrs, CKA_DERIVE, &cktrue, sizeof(CK_BBOOL));attrs++; 24 PK11_SETATTRS(attrs, CKA_DERIVE, &cktrue, sizeof(CK_BBOOL));attrs++;
29 @@ -242,6 +231,10 @@ PK11_ImportPublicKey(PK11SlotInfo *slot, 25 @@ -210,6 +196,10 @@
30 SECITEM_FreeItem(pubValue,PR_TRUE); 26 SECITEM_FreeItem(pubValue,PR_TRUE);
31 } 27 }
32 if ( rv != SECSuccess) { 28 if ( rv != SECSuccess) {
33 + /* CKR_ATTRIBUTE_VALUE_INVALID is mapped to SEC_ERROR_BAD_DATA */ 29 + /* CKR_ATTRIBUTE_VALUE_INVALID is mapped to SEC_ERROR_BAD_DATA */
34 + if (PORT_GetError() == SEC_ERROR_BAD_DATA) { 30 + if (PORT_GetError() == SEC_ERROR_BAD_DATA) {
35 + PORT_SetError( SEC_ERROR_BAD_KEY ); 31 + PORT_SetError( SEC_ERROR_BAD_KEY );
36 + } 32 + }
37 return CK_INVALID_HANDLE; 33 return CK_INVALID_HANDLE;
38 } 34 }
39 } 35 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698