Uprev NSS to 3.23 on iOS

net/third_party/nss/patches/didhandshakeresume.patch

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 bceeae1d8e6f7ad870edec26ca9da87c3c04c32c..8acb6e718ad92a1177fd2fb1eea1fad3ab97c302 100644
--- a/net/third_party/nss/patches/didhandshakeresume.patch
+++ b/net/third_party/nss/patches/didhandshakeresume.patch
@@ -1,8 +1,8 @@
 diff --git a/lib/ssl/ssl.h b/lib/ssl/ssl.h
-index 48fa018..0983b5f 100644
+index 3974ee8..e905aab 100644
 --- a/lib/ssl/ssl.h
 +++ b/lib/ssl/ssl.h
-@@ -1117,6 +1117,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegotiatedExtension(PRFileDesc * socket,
+@@ -1123,6 +1123,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegotiatedExtension(PRFileDesc *socket,
                                                        SSLExtensionType extId,
                                                        PRBool *yes);
  
@@ -13,21 +13,22 @@ index 48fa018..0983b5f 100644
  ** 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 21754d6..b73f8f6 100644
+index cc15406..601df2a 100644
 --- a/lib/ssl/sslsock.c
 +++ b/lib/ssl/sslsock.c
-@@ -2151,6 +2151,20 @@ SSL_PeerStapledOCSPResponses(PRFileDesc *fd)
+@@ -2481,6 +2481,21 @@ SSL_PeerStapledOCSPResponses(PRFileDesc *fd)
      return &ss->sec.ci.sid->peerCertStatus;
  }
  
 +SECStatus
-+SSL_HandshakeResumedSession(PRFileDesc *fd, PRBool *handshake_resumed) {
++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;
++        SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession",
++                 SSL_GETPID(), fd));
++        return SECFailure;
 +    }
 +
 +    *handshake_resumed = ss->ssl3.hs.isResuming;