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

Unified Diff: net/third_party/nss/patches/suitebonly.patch

Issue 1053903002: Update libssl to NSS 3.18 RTM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo Created 5 years, 9 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
Index: net/third_party/nss/patches/suitebonly.patch
diff --git a/net/third_party/nss/patches/suitebonly.patch b/net/third_party/nss/patches/suitebonly.patch
index c91314be887ae1d621604fa37b647013a2ba55fb..9776d7d485423dbcfa3b9c1584d796865424f3dc 100644
--- a/net/third_party/nss/patches/suitebonly.patch
+++ b/net/third_party/nss/patches/suitebonly.patch
@@ -1,7 +1,8 @@
-diff -pu a/nss/lib/ssl/ssl3ecc.c b/nss/lib/ssl/ssl3ecc.c
---- a/nss/lib/ssl/ssl3ecc.c 2014-01-03 19:28:03.550814608 -0800
-+++ b/nss/lib/ssl/ssl3ecc.c 2014-01-03 19:40:46.523288747 -0800
-@@ -1073,6 +1073,7 @@ static const PRUint8 ecPtFmt[6] = {
+diff --git a/ssl/ssl3ecc.c b/ssl/ssl3ecc.c
+index 555c89d..0f805ec 100644
+--- a/ssl/ssl3ecc.c
++++ b/ssl/ssl3ecc.c
+@@ -1089,6 +1089,7 @@ static const PRUint8 ecPtFmt[6] = {
static PRBool
ssl3_SuiteBOnly(sslSocket *ss)
{
@@ -9,7 +10,7 @@ diff -pu a/nss/lib/ssl/ssl3ecc.c b/nss/lib/ssl/ssl3ecc.c
/* See if we can support small curves (like 163). If not, assume we can
* only support Suite-B curves (P-256, P-384, P-521). */
PK11SlotInfo *slot =
-@@ -1086,6 +1087,9 @@ ssl3_SuiteBOnly(sslSocket *ss)
+@@ -1102,6 +1103,9 @@ ssl3_SuiteBOnly(sslSocket *ss)
/* we can, presume we can do all curves */
PK11_FreeSlot(slot);
return PR_FALSE;
« no previous file with comments | « net/third_party/nss/patches/signedcertificatetimestamps.patch ('k') | net/third_party/nss/patches/tls12chromium.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698