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 |
deleted file mode 100644 |
index 8acb6e718ad92a1177fd2fb1eea1fad3ab97c302..0000000000000000000000000000000000000000 |
--- a/net/third_party/nss/patches/didhandshakeresume.patch |
+++ /dev/null |
@@ -1,40 +0,0 @@ |
-diff --git a/lib/ssl/ssl.h b/lib/ssl/ssl.h |
-index 3974ee8..e905aab 100644 |
---- a/lib/ssl/ssl.h |
-+++ b/lib/ssl/ssl.h |
-@@ -1123,6 +1123,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegotiatedExtension(PRFileDesc *socket, |
- SSLExtensionType extId, |
- PRBool *yes); |
- |
-+SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd, |
-+ PRBool *last_handshake_resumed); |
-+ |
- /* |
- ** How long should we wait before retransmitting the next flight of |
- ** the DTLS handshake? Returns SECFailure if not DTLS or not in a |
-diff --git a/lib/ssl/sslsock.c b/lib/ssl/sslsock.c |
-index cc15406..601df2a 100644 |
---- a/lib/ssl/sslsock.c |
-+++ b/lib/ssl/sslsock.c |
-@@ -2481,6 +2481,21 @@ SSL_PeerStapledOCSPResponses(PRFileDesc *fd) |
- return &ss->sec.ci.sid->peerCertStatus; |
- } |
- |
-+SECStatus |
-+SSL_HandshakeResumedSession(PRFileDesc *fd, PRBool *handshake_resumed) |
-+{ |
-+ sslSocket *ss = ssl_FindSocket(fd); |
-+ |
-+ if (!ss) { |
-+ SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession", |
-+ SSL_GETPID(), fd)); |
-+ return SECFailure; |
-+ } |
-+ |
-+ *handshake_resumed = ss->ssl3.hs.isResuming; |
-+ return SECSuccess; |
-+} |
-+ |
- /************************************************************************/ |
- /* The following functions are the TOP LEVEL SSL functions. |
- ** They all get called through the NSPRIOMethods table below. |