Update net/third_party/nss to NSS_3_15_5_BETA2.

net/third_party/nss/patches/cipherorder.patch

Index: net/third_party/nss/patches/cipherorder.patch
===================================================================
--- net/third_party/nss/patches/cipherorder.patch	(revision 245705)
+++ net/third_party/nss/patches/cipherorder.patch	(working copy)
@@ -1,7 +1,7 @@
 diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c
---- a/nss/lib/ssl/ssl3con.c	2014-01-03 19:44:16.406720764 -0800
-+++ b/nss/lib/ssl/ssl3con.c	2014-01-03 19:44:24.516853386 -0800
-@@ -12539,6 +12539,46 @@ ssl3_CipherPrefGet(sslSocket *ss, ssl3Ci
+--- a/nss/lib/ssl/ssl3con.c	2014-01-17 18:45:24.378132013 -0800
++++ b/nss/lib/ssl/ssl3con.c	2014-01-17 18:46:29.929216162 -0800
+@@ -12540,6 +12540,46 @@ ssl3_CipherPrefGet(sslSocket *ss, ssl3Ci
      return rv;
  }
  
@@ -49,9 +49,9 @@
  void
  ssl3_InitSocketPolicy(sslSocket *ss)
 diff -pu a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h
---- a/nss/lib/ssl/ssl.h	2014-01-03 19:44:16.416720928 -0800
-+++ b/nss/lib/ssl/ssl.h	2014-01-03 19:44:24.516853386 -0800
-@@ -265,6 +265,13 @@ SSL_IMPORT SECStatus SSL_CipherPrefGetDe
+--- a/nss/lib/ssl/ssl.h	2014-01-17 18:45:24.378132013 -0800
++++ b/nss/lib/ssl/ssl.h	2014-01-17 18:46:29.929216162 -0800
+@@ -285,6 +285,13 @@ SSL_IMPORT SECStatus SSL_CipherPrefGetDe
  SSL_IMPORT SECStatus SSL_CipherPolicySet(PRInt32 cipher, PRInt32 policy);
  SSL_IMPORT SECStatus SSL_CipherPolicyGet(PRInt32 cipher, PRInt32 *policy);
  
@@ -66,9 +66,9 @@
   * values. See RFC 5929. */
  typedef enum SSLChannelBindingType {
 diff -pu a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h
---- a/nss/lib/ssl/sslimpl.h	2014-01-03 19:44:16.416720928 -0800
-+++ b/nss/lib/ssl/sslimpl.h	2014-01-03 19:44:24.516853386 -0800
-@@ -1741,6 +1741,8 @@ extern SECStatus ssl3_CipherPrefSet(sslS
+--- a/nss/lib/ssl/sslimpl.h	2014-01-17 18:45:24.378132013 -0800
++++ b/nss/lib/ssl/sslimpl.h	2014-01-17 18:46:29.929216162 -0800
+@@ -1743,6 +1743,8 @@ extern SECStatus ssl3_CipherPrefSet(sslS
  extern SECStatus ssl3_CipherPrefGet(sslSocket *ss, ssl3CipherSuite which, PRBool *on);
  extern SECStatus ssl2_CipherPrefSet(sslSocket *ss, PRInt32 which, PRBool enabled);
  extern SECStatus ssl2_CipherPrefGet(sslSocket *ss, PRInt32 which, PRBool *enabled);
@@ -78,9 +78,9 @@
  extern SECStatus ssl3_SetPolicy(ssl3CipherSuite which, PRInt32 policy);
  extern SECStatus ssl3_GetPolicy(ssl3CipherSuite which, PRInt32 *policy);
 diff -pu a/nss/lib/ssl/sslsock.c b/nss/lib/ssl/sslsock.c
---- a/nss/lib/ssl/sslsock.c	2014-01-03 19:44:16.416720928 -0800
-+++ b/nss/lib/ssl/sslsock.c	2014-01-03 19:44:24.516853386 -0800
-@@ -1256,6 +1256,19 @@ SSL_CipherPrefSet(PRFileDesc *fd, PRInt3
+--- a/nss/lib/ssl/sslsock.c	2014-01-17 18:45:24.378132013 -0800
++++ b/nss/lib/ssl/sslsock.c	2014-01-17 18:46:29.929216162 -0800
+@@ -1278,6 +1278,19 @@ SSL_CipherPrefSet(PRFileDesc *fd, PRInt3
      return rv;
  }