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

Unified Diff: patches/nss-remove-fortezza.patch

Issue 2078763002: Delete bundled copy of NSS and replace with README. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/nss@master
Patch Set: Delete bundled copy of NSS and replace with README. Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « patches/nspr-static.patch ('k') | patches/nss-static.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
- }
- }
« no previous file with comments | « patches/nspr-static.patch ('k') | patches/nss-static.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698