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

Unified Diff: net/third_party/nss/patches/didhandshakeresume.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
« no previous file with comments | « net/third_party/nss/patches/clientauth.patch ('k') | net/third_party/nss/patches/fallbackscsv.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/third_party/nss/patches/didhandshakeresume.patch
diff --git a/net/third_party/nss/patches/didhandshakeresume.patch b/net/third_party/nss/patches/didhandshakeresume.patch
index 70f878dc68ef4895429bd8abd55b3b10601327fa..f4b04be64c5b26c38b6d9171099a206dfd948886 100644
--- a/net/third_party/nss/patches/didhandshakeresume.patch
+++ b/net/third_party/nss/patches/didhandshakeresume.patch
@@ -1,7 +1,8 @@
-diff -pu a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h
---- a/nss/lib/ssl/ssl.h 2014-01-17 17:52:46.715854283 -0800
-+++ b/nss/lib/ssl/ssl.h 2014-01-17 17:53:20.876422375 -0800
-@@ -997,6 +997,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegoti
+diff --git a/ssl/ssl.h b/ssl/ssl.h
+index 4e7d52e..34142fc 100644
+--- a/ssl/ssl.h
++++ b/ssl/ssl.h
+@@ -1007,6 +1007,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegotiatedExtension(PRFileDesc * socket,
SSLExtensionType extId,
PRBool *yes);
@@ -11,10 +12,11 @@ diff -pu a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h
/*
** How long should we wait before retransmitting the next flight of
** the DTLS handshake? Returns SECFailure if not DTLS or not in a
-diff -pu a/nss/lib/ssl/sslsock.c b/nss/lib/ssl/sslsock.c
---- a/nss/lib/ssl/sslsock.c 2014-01-17 17:52:46.715854283 -0800
-+++ b/nss/lib/ssl/sslsock.c 2014-01-17 17:53:20.876422375 -0800
-@@ -1855,6 +1855,20 @@ SSL_PeerStapledOCSPResponses(PRFileDesc
+diff --git a/ssl/sslsock.c b/ssl/sslsock.c
+index fccc664..688f399 100644
+--- a/ssl/sslsock.c
++++ b/ssl/sslsock.c
+@@ -1897,6 +1897,20 @@ SSL_PeerStapledOCSPResponses(PRFileDesc *fd)
return &ss->sec.ci.sid->peerCertStatus;
}
« no previous file with comments | « net/third_party/nss/patches/clientauth.patch ('k') | net/third_party/nss/patches/fallbackscsv.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698