Update net/third_party/nss to NSS 3.13.3.

net/third_party/nss/patches/getrequestedclientcerttypes.patch

Index: net/third_party/nss/patches/getrequestedclientcerttypes.patch
===================================================================
--- net/third_party/nss/patches/getrequestedclientcerttypes.patch	(revision 124804)
+++ net/third_party/nss/patches/getrequestedclientcerttypes.patch	(working copy)
@@ -1,11 +1,7 @@
-Index: security/nss/lib/ssl/ssl.h
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ssl/ssl.h,v
-retrieving revision 1.38.2.1
-diff -u -r1.38.2.1 ssl.h
---- security/nss/lib/ssl/ssl.h	31 Jul 2010 04:33:52 -0000	1.38.2.1
-+++ security/nss/lib/ssl/ssl.h	6 Dec 2011 00:24:08 -0000
-@@ -459,6 +459,16 @@
+diff -up a/src/net/third_party/nss/ssl/ssl.h b/src/net/third_party/nss/ssl/ssl.h
+--- a/src/net/third_party/nss/ssl/ssl.h	2012-02-29 17:23:52.089678011 -0800
++++ b/src/net/third_party/nss/ssl/ssl.h	2012-02-29 17:43:25.796676478 -0800
+@@ -648,6 +648,16 @@ SSL_IMPORT SECStatus SSL_ReHandshakeWith
                                                  PRBool flushCache,
                                                  PRIntervalTime timeout);
  
@@ -22,14 +18,10 @@
  
  #ifdef SSL_DEPRECATED_FUNCTION 
  /* deprecated!
-Index: security/nss/lib/ssl/ssl3con.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ssl/ssl3con.c,v
-retrieving revision 1.142.2.4
-diff -u -r1.142.2.4 ssl3con.c
---- security/nss/lib/ssl/ssl3con.c	1 Sep 2010 19:47:11 -0000	1.142.2.4
-+++ security/nss/lib/ssl/ssl3con.c	6 Dec 2011 00:24:08 -0000
-@@ -5473,6 +5473,9 @@
+diff -up a/src/net/third_party/nss/ssl/ssl3con.c b/src/net/third_party/nss/ssl/ssl3con.c
+--- a/src/net/third_party/nss/ssl/ssl3con.c	2012-02-29 17:23:52.089678011 -0800
++++ b/src/net/third_party/nss/ssl/ssl3con.c	2012-02-29 17:43:25.796676478 -0800
+@@ -5567,6 +5567,9 @@ ssl3_HandleCertificateRequest(sslSocket 
      if (rv != SECSuccess)
      	goto loser;		/* malformed, alert has been sent */
  
@@ -39,22 +31,18 @@
      arena = ca_list.arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
      if (arena == NULL)
      	goto no_mem;
-@@ -5608,6 +5611,7 @@
+@@ -5756,6 +5759,7 @@ loser:
      PORT_SetError(errCode);
      rv = SECFailure;
  done:
 +    ss->requestedCertTypes = NULL;
      if (arena != NULL)
      	PORT_FreeArena(arena, PR_FALSE);
-     return rv;
-Index: security/nss/lib/ssl/sslimpl.h
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ssl/sslimpl.h,v
-retrieving revision 1.77.2.1
-diff -u -r1.77.2.1 sslimpl.h
---- security/nss/lib/ssl/sslimpl.h	31 Jul 2010 04:33:52 -0000	1.77.2.1
-+++ security/nss/lib/ssl/sslimpl.h	6 Dec 2011 00:24:08 -0000
-@@ -1044,6 +1044,10 @@
+ #ifdef NSS_PLATFORM_CLIENT_AUTH
+diff -up a/src/net/third_party/nss/ssl/sslimpl.h b/src/net/third_party/nss/ssl/sslimpl.h
+--- a/src/net/third_party/nss/ssl/sslimpl.h	2012-02-29 17:23:52.089678011 -0800
++++ b/src/net/third_party/nss/ssl/sslimpl.h	2012-02-29 17:43:25.796676478 -0800
+@@ -1097,6 +1097,10 @@ struct sslSocketStr {
      unsigned int     sizeCipherSpecs;
  const unsigned char *  preferredCipher;
  
@@ -65,15 +53,11 @@
      ssl3KeyPair *         stepDownKeyPair;	/* RSA step down keys */
  
      /* Callbacks */
-Index: security/nss/lib/ssl/sslsock.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ssl/sslsock.c,v
-retrieving revision 1.67.2.1
-diff -u -r1.67.2.1 sslsock.c
---- security/nss/lib/ssl/sslsock.c	31 Jul 2010 04:33:52 -0000	1.67.2.1
-+++ security/nss/lib/ssl/sslsock.c	6 Dec 2011 00:24:08 -0000
-@@ -1373,6 +1373,20 @@
-     return NULL;
+diff -up a/src/net/third_party/nss/ssl/sslsock.c b/src/net/third_party/nss/ssl/sslsock.c
+--- a/src/net/third_party/nss/ssl/sslsock.c	2012-02-29 17:12:15.750044671 -0800
++++ b/src/net/third_party/nss/ssl/sslsock.c	2012-02-29 17:43:25.796676478 -0800
+@@ -1615,6 +1615,20 @@ SSL_HandshakeResumedSession(PRFileDesc *
+     return SECSuccess;
  }
  
 +const SECItem *
@@ -93,7 +77,7 @@
  /************************************************************************/
  /* The following functions are the TOP LEVEL SSL functions.
  ** They all get called through the NSPRIOMethods table below.
-@@ -2357,6 +2371,7 @@
+@@ -2643,6 +2657,7 @@ ssl_NewSocket(PRBool makeLocks)
  	    sc->serverKeyPair   = NULL;
  	    sc->serverKeyBits   = 0;
  	}