Update net/third_party/nss to NSS 3.15.4.

net/third_party/nss/patches/secretexporterlocks.patch

Index: net/third_party/nss/patches/secretexporterlocks.patch
===================================================================
--- net/third_party/nss/patches/secretexporterlocks.patch	(revision 242942)
+++ net/third_party/nss/patches/secretexporterlocks.patch	(working copy)
@@ -1,7 +1,7 @@
 diff -pu a/nss/lib/ssl/sslinfo.c b/nss/lib/ssl/sslinfo.c
---- a/nss/lib/ssl/sslinfo.c	2013-07-31 12:07:10.974699609 -0700
-+++ b/nss/lib/ssl/sslinfo.c	2013-07-31 14:11:28.834113906 -0700
-@@ -349,8 +349,13 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,
+--- a/nss/lib/ssl/sslinfo.c	2014-01-03 19:28:03.550814608 -0800
++++ b/nss/lib/ssl/sslinfo.c	2014-01-03 19:40:13.512748975 -0800
+@@ -350,8 +350,13 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,
  	return SECFailure;
      }
  
@@ -15,7 +15,7 @@
  	return SECFailure;
      }
  
-@@ -361,13 +366,17 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,
+@@ -362,13 +367,17 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,
      }
      val = PORT_Alloc(valLen);
      if (!val) {
@@ -33,7 +33,7 @@
      if (hasContext) {
  	val[i++] = contextLen >> 8;
  	val[i++] = contextLen;
-@@ -388,6 +397,8 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,
+@@ -389,6 +398,8 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,
  					 valLen, out, outLen);
      }
      ssl_ReleaseSpecReadLock(ss);