Update net/third_party/nss/ssl to NSS 3.14.

net/third_party/nss/ssl/sslinfo.c

Index: net/third_party/nss/ssl/sslinfo.c
===================================================================
--- net/third_party/nss/ssl/sslinfo.c	(revision 166942)
+++ net/third_party/nss/ssl/sslinfo.c	(working copy)
@@ -1,41 +1,7 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape security libraries.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Dr Vipul Gupta <vipul.gupta@sun.com>, Sun Microsystems Laboratories
- *   Douglas Stebila <douglas@stebila.ca>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-/* $Id: sslinfo.c,v 1.28 2012/03/14 00:56:43 wtc%google.com Exp $ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/* $Id: sslinfo.c,v 1.31 2012/08/03 23:54:31 wtc%google.com Exp $ */
 #include "ssl.h"
 #include "sslimpl.h"
 #include "sslproto.h"
@@ -98,7 +64,7 @@
 	    ssl_GetSpecReadLock(ss);
 	    /* XXX  The cipher suite should be in the specs and this
 	     * function should get it from cwSpec rather than from the "hs".
-	     * See bug 275744 comment 69.
+	     * See bug 275744 comment 69 and bug 766137.
 	     */
 	    inf.cipherSuite           = ss->ssl3.hs.cipher_suite;
 	    inf.compressionMethod     = ss->ssl3.cwSpec->compression_method;
@@ -376,13 +342,8 @@
 	return SECFailure;
     }
 
-    ssl_GetRecvBufLock(ss);
-    ssl_GetSSL3HandshakeLock(ss);

[wtc, 2012/11/12 18:31:01]

I need to look into why the NSS upstream doesn't acquire
these locks. Perhaps I forgot to upstream this code.

For now I will add a patch to restore this code.

[wtc, 2012/11/13 01:18:57]

I tracked this down. This code was added in
https://chromiumcodereview.appspot.com/10454066.
We didn't add a Chromium patch file at that time.
I added one (secretexporterlocks.patch) in this CL.

-
     if (ss->version < SSL_LIBRARY_VERSION_3_1_TLS) {
-	PORT_SetError(SSL_ERROR_UNSUPPORTED_VERSION);
-	ssl_ReleaseSSL3HandshakeLock(ss);
-	ssl_ReleaseRecvBufLock(ss);
+	PORT_SetError(SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_VERSION);
 	return SECFailure;
     }
 
@@ -393,17 +354,13 @@
     }
     val = PORT_Alloc(valLen);
     if (!val) {
-	ssl_ReleaseSSL3HandshakeLock(ss);
-	ssl_ReleaseRecvBufLock(ss);
 	return SECFailure;
     }
     i = 0;
-
     PORT_Memcpy(val + i, &ss->ssl3.hs.client_random.rand, SSL3_RANDOM_LENGTH);
     i += SSL3_RANDOM_LENGTH;
     PORT_Memcpy(val + i, &ss->ssl3.hs.server_random.rand, SSL3_RANDOM_LENGTH);
     i += SSL3_RANDOM_LENGTH;
-
     if (hasContext) {
 	val[i++] = contextLen >> 8;
 	val[i++] = contextLen;
@@ -424,8 +381,6 @@
 					 valLen, out, outLen);
     }
     ssl_ReleaseSpecReadLock(ss);
-    ssl_ReleaseSSL3HandshakeLock(ss);
-    ssl_ReleaseRecvBufLock(ss);
 
     PORT_ZFree(val, valLen);
     return rv;