Update net/third_party/nss to NSS 3.15.4.

net/third_party/nss/patches/tls12chromium.patch

Index: net/third_party/nss/patches/tls12chromium.patch
===================================================================
--- net/third_party/nss/patches/tls12chromium.patch	(revision 242942)
+++ net/third_party/nss/patches/tls12chromium.patch	(working copy)
@@ -1,6 +1,6 @@
 diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c
---- a/nss/lib/ssl/ssl3con.c	2013-07-31 14:12:19.414856329 -0700
-+++ b/nss/lib/ssl/ssl3con.c	2013-07-31 14:13:56.916288878 -0700
+--- a/nss/lib/ssl/ssl3con.c	2014-01-03 18:55:44.659133336 -0800
++++ b/nss/lib/ssl/ssl3con.c	2014-01-03 18:57:20.390695317 -0800
 @@ -31,6 +31,15 @@
  #include "blapi.h"
  #endif
@@ -18,8 +18,8 @@
  #ifdef NSS_ENABLE_ZLIB
  #include "zlib.h"
 diff -pu a/nss/lib/ssl/ssl3ecc.c b/nss/lib/ssl/ssl3ecc.c
---- a/nss/lib/ssl/ssl3ecc.c	2013-07-31 14:13:15.115674638 -0700
-+++ b/nss/lib/ssl/ssl3ecc.c	2013-07-31 14:13:56.916288878 -0700
+--- a/nss/lib/ssl/ssl3ecc.c	2014-01-03 18:56:43.300090124 -0800
++++ b/nss/lib/ssl/ssl3ecc.c	2014-01-03 18:57:20.390695317 -0800
 @@ -30,6 +30,12 @@
  
  #include <stdio.h>
@@ -32,10 +32,10 @@
 +
  #ifdef NSS_ENABLE_ECC
  
- /*
+ #ifndef PK11_SETATTRS
 diff -pu a/nss/lib/ssl/sslsock.c b/nss/lib/ssl/sslsock.c
---- a/nss/lib/ssl/sslsock.c	2013-07-31 14:10:35.113325316 -0700
-+++ b/nss/lib/ssl/sslsock.c	2013-07-31 14:16:39.538677991 -0700
+--- a/nss/lib/ssl/sslsock.c	2014-01-03 18:55:44.669133500 -0800
++++ b/nss/lib/ssl/sslsock.c	2014-01-03 18:57:20.400695477 -0800
 @@ -17,8 +17,15 @@
  #ifndef NO_PKCS11_BYPASS
  #include "blapi.h"
@@ -51,8 +51,8 @@
 +
  #define SET_ERROR_CODE   /* reminder */
  
- struct cipherPolicyStr {
-@@ -1900,6 +1907,24 @@ SSL_VersionRangeGet(PRFileDesc *fd, SSLV
+ static const sslSocketOps ssl_default_ops = {	/* No SSL. */
+@@ -1814,6 +1821,24 @@ SSL_VersionRangeGet(PRFileDesc *fd, SSLV
      return SECSuccess;
  }
  
@@ -77,7 +77,7 @@
  SECStatus
  SSL_VersionRangeSet(PRFileDesc *fd, const SSLVersionRange *vrange)
  {
-@@ -1920,6 +1945,20 @@ SSL_VersionRangeSet(PRFileDesc *fd, cons
+@@ -1834,6 +1859,20 @@ SSL_VersionRangeSet(PRFileDesc *fd, cons
      ssl_GetSSL3HandshakeLock(ss);
  
      ss->vrange = *vrange;