Mercurial > trustbridge > nss-cmake-static
comparison patches/nss-remove-fortezza.patch @ 0:1e5118fa0cb1
This is NSS with a Cmake Buildsyste
To compile a static NSS library for Windows we've used the
Chromium-NSS fork and added a Cmake buildsystem to compile
it statically for Windows. See README.chromium for chromium
changes and README.trustbridge for our modifications.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Mon, 28 Jul 2014 10:47:06 +0200 |
| parents | |
| children |
comparison
equal
deleted
inserted
replaced
| -1:000000000000 | 0:1e5118fa0cb1 |
|---|---|
| 1 diff -r 3f0105dfc733 lib/pk11wrap/pk11akey.c | |
| 2 --- a/lib/pk11wrap/pk11akey.c Mon Apr 22 14:22:48 2013 +0200 | |
| 3 +++ b/lib/pk11wrap/pk11akey.c Mon Apr 22 14:41:49 2013 -0700 | |
| 4 @@ -136,20 +136,6 @@ | |
| 5 PK11_SETATTRS(attrs, CKA_VALUE, pubKey->u.dsa.publicValue.data, | |
| 6 pubKey->u.dsa.publicValue.len); attrs++; | |
| 7 break; | |
| 8 - case fortezzaKey: | |
| 9 - keyType = CKK_DSA; | |
| 10 - PK11_SETATTRS(attrs, CKA_VERIFY, &cktrue, sizeof(CK_BBOOL));attrs++; | |
| 11 - signedattr = attrs; | |
| 12 - PK11_SETATTRS(attrs, CKA_PRIME,pubKey->u.fortezza.params.prime.data, | |
| 13 - pubKey->u.fortezza.params.prime.len); attrs++; | |
| 14 - PK11_SETATTRS(attrs,CKA_SUBPRIME, | |
| 15 - pubKey->u.fortezza.params.subPrime.data, | |
| 16 - pubKey->u.fortezza.params.subPrime.len);attrs++; | |
| 17 - PK11_SETATTRS(attrs, CKA_BASE, pubKey->u.fortezza.params.base.data, | |
| 18 - pubKey->u.fortezza.params.base.len); attrs++; | |
| 19 - PK11_SETATTRS(attrs, CKA_VALUE, pubKey->u.fortezza.DSSKey.data, | |
| 20 - pubKey->u.fortezza.DSSKey.len); attrs++; | |
| 21 - break; | |
| 22 case dhKey: | |
| 23 keyType = CKK_DH; | |
| 24 PK11_SETATTRS(attrs, CKA_DERIVE, &cktrue, sizeof(CK_BBOOL));attrs++; | |
| 25 @@ -210,6 +196,10 @@ | |
| 26 SECITEM_FreeItem(pubValue,PR_TRUE); | |
| 27 } | |
| 28 if ( rv != SECSuccess) { | |
| 29 + /* CKR_ATTRIBUTE_VALUE_INVALID is mapped to SEC_ERROR_BAD_DATA */ | |
| 30 + if (PORT_GetError() == SEC_ERROR_BAD_DATA) { | |
| 31 + PORT_SetError( SEC_ERROR_BAD_KEY ); | |
| 32 + } | |
| 33 return CK_INVALID_HANDLE; | |
| 34 } | |
| 35 } |