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

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

Issue 1504923011: Update NSS to 3.21 RTM and NSPR to 4.11 RTM (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/nss
Patch Set: Created 5 years 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
Index: patches/nss-remove-fortezza.patch
diff --git a/patches/nss-remove-fortezza.patch b/patches/nss-remove-fortezza.patch
index c51655a863639c74ffd66f04bf0b909e00fe750b..a1e7607058020f51ec868eb8eff8ff1543927c21 100644
--- a/patches/nss-remove-fortezza.patch
+++ b/patches/nss-remove-fortezza.patch
@@ -1,7 +1,8 @@
-diff -r 3f0105dfc733 lib/pk11wrap/pk11akey.c
---- a/lib/pk11wrap/pk11akey.c Mon Apr 22 14:22:48 2013 +0200
-+++ b/lib/pk11wrap/pk11akey.c Mon Apr 22 14:41:49 2013 -0700
-@@ -136,20 +136,6 @@
+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;
@@ -22,7 +23,7 @@ diff -r 3f0105dfc733 lib/pk11wrap/pk11akey.c
case dhKey:
keyType = CKK_DH;
PK11_SETATTRS(attrs, CKA_DERIVE, &cktrue, sizeof(CK_BBOOL));attrs++;
-@@ -210,6 +196,10 @@
+@@ -209,6 +195,10 @@ PK11_ImportPublicKey(PK11SlotInfo *slot, SECKEYPublicKey *pubKey,
SECITEM_FreeItem(pubValue,PR_TRUE);
}
if ( rv != SECSuccess) {

Powered by Google App Engine
This is Rietveld 408576698