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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1053903002: Update libssl to NSS 3.18 RTM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Prune patches 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
« net/third_party/nss/README.chromium ('K') | « net/third_party/nss/patches/secitemarray.patch ('k') | net/third_party/nss/patches/sessioncache.patch » ('j') | net/third_party/nss/ssl/dtlscon.c » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/third_party/nss/patches/secretexporterlocks.patch
diff --git a/net/third_party/nss/patches/secretexporterlocks.patch b/net/third_party/nss/patches/secretexporterlocks.patch
index 85d98dfdab4d9bdb97fde3075de70b91f6c98b91..7716f938dc29a1e44cf2fcbe6ee9e26b1a23aa78 100644
--- a/net/third_party/nss/patches/secretexporterlocks.patch
+++ b/net/third_party/nss/patches/secretexporterlocks.patch
@@ -1,6 +1,7 @@
-diff -pu a/nss/lib/ssl/sslinfo.c b/nss/lib/ssl/sslinfo.c
---- a/nss/lib/ssl/sslinfo.c 2014-01-17 17:49:26.072517368 -0800
-+++ b/nss/lib/ssl/sslinfo.c 2014-01-17 18:00:29.773545219 -0800
+diff --git a/ssl/sslinfo.c b/ssl/sslinfo.c
+index 00f2f38..ba230d2 100644
+--- a/ssl/sslinfo.c
++++ b/ssl/sslinfo.c
@@ -350,8 +350,13 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,
return SECFailure;
}
« net/third_party/nss/README.chromium ('K') | « net/third_party/nss/patches/secitemarray.patch ('k') | net/third_party/nss/patches/sessioncache.patch » ('j') | net/third_party/nss/ssl/dtlscon.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698