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

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

Most of the changes are related to the MPL 2 license upgrade and the
new NO_PKCS11_BYPASS macro. Nine of our patches have been subsumed.

The fixes for the following bugs are included:
https://bugzilla.mozilla.org/show_bug.cgi?id=793033
https://bugzilla.mozilla.org/show_bug.cgi?id=792681
https://bugzilla.mozilla.org/show_bug.cgi?id=764649
https://bugzilla.mozilla.org/show_bug.cgi?id=751793
https://bugzilla.mozilla.org/show_bug.cgi?id=745281
https://bugzilla.mozilla.org/show_bug.cgi?id=734519
https://bugzilla.mozilla.org/show_bug.cgi?id=697910
https://bugzilla.mozilla.org/show_bug.cgi?id=565047

R=agl@chromium.org,rsleevi@chromum.org
BUG=159669
TEST=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=167455

[wtc, 2012-11-10 01:56:22]

Please review patch set 5. Thanks.

[wtc, 2012-11-10 01:57:12]

On 2012/11/10 01:56:22, wtc wrote:
> Please review patch set 5. Thanks.

Argh, I meant patch set 6.

[agl, 2012-11-12 16:10:15]

lgtm

[wtc, 2012-11-12 18:31:00]

https://codereview.chromium.org/11275240/diff/91/net/third_party/nss/ssl/ssli...
File net/third_party/nss/ssl/sslinfo.c (left):

https://codereview.chromium.org/11275240/diff/91/net/third_party/nss/ssl/ssli...
net/third_party/nss/ssl/sslinfo.c:380: ssl_GetSSL3HandshakeLock(ss);

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 improved the CL at bit. You can just review the diffs
between patch sets 6 and 7.

http://codereview.chromium.org/11275240/diff/91/net/third_party/nss/ssl/sslin...
File net/third_party/nss/ssl/sslinfo.c (left):

http://codereview.chromium.org/11275240/diff/91/net/third_party/nss/ssl/sslin...
net/third_party/nss/ssl/sslinfo.c:380: ssl_GetSSL3HandshakeLock(ss);

On 2012/11/12 18:31:01, wtc wrote:
> 
> I need to look into why the NSS upstream doesn't acquire
> these locks. Perhaps I forgot to upstream this code.

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.

[commit-bot: I haz the power, 2012-11-13 05:03:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/wtc@chromium.org/11275240/23025

[commit-bot: I haz the power, 2012-11-13 05:04:08]

Failed to apply patch for net/third_party/nss/ssl/dtlscon.c:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file net/third_party/nss/ssl/dtlscon.c
  Hunk #1 FAILED at 1.
  Hunk #2 FAILED at 286.
  Hunk #3 FAILED at 453.
  Hunk #4 FAILED at 497.
  Hunk #5 FAILED at 623.
  5 out of 5 hunks FAILED -- saving rejects to file
net/third_party/nss/ssl/dtlscon.c.rej

Patch:   N   net/third_party/nss/ssl/dtlscon.c
Index: net/third_party/nss/ssl/dtlscon.c
===================================================================
--- net/third_party/nss/ssl/dtlscon.c	(revision 166942)
+++ net/third_party/nss/ssl/dtlscon.c	(working copy)
@@ -1,43 +1,11 @@
+/* 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/. */
+
 /*
  * DTLS Protocol
- *
- * ***** 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) 1994-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Eric Rescorla <ekr@rtfm.com>
- *
- * 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: $ */
+ */
+/* $Id: dtlscon.c,v 1.5 2012/09/28 01:46:45 wtc%google.com Exp $ */
 
 #include "ssl.h"
 #include "sslimpl.h"
@@ -286,7 +254,7 @@
 
             /* At this point we are advancing our state machine, so
              * we can free our last flight of messages */
-            dtls_FreeHandshakeMessages(ss->ssl3.hs.lastMessageFlight);
+            dtls_FreeHandshakeMessages(&ss->ssl3.hs.lastMessageFlight);
 	    ss->ssl3.hs.recvdHighWater = -1;
 	    dtls_CancelTimer(ss);
 
@@ -453,7 +421,7 @@
 
 		    /* At this point we are advancing our state machine, so
 		     * we can free our last flight of messages */
-		    dtls_FreeHandshakeMessages(ss->ssl3.hs.lastMessageFlight);
+		    dtls_FreeHandshakeMessages(&ss->ssl3.hs.lastMessageFlight);
 		    dtls_CancelTimer(ss);
 
 		    /* If there have been no retries this time, reset the
@@ -497,7 +465,7 @@
 	PORT_SetError(SEC_ERROR_NO_MEMORY);
 	rv = SECFailure;
     } else {
-	PR_APPEND_LINK(&msg->link, ss->ssl3.hs.lastMessageFlight);
+	PR_APPEND_LINK(&msg->link, &ss->ssl3.hs.lastMessageFlight);
     }
 
     return rv;
@@ -623,8 +591,8 @@
      * stuffed something in ss->pendingBuf
      */
     PORT_Assert(!ss->pendingBuf.len);
-    for (msg_p = PR_LIST_HEAD(ss->ssl3.hs.lastMessageFlight);
-	 msg_p != ss->ssl3.hs.lastMessageFlight;
+    for (msg_p = PR_LIST_HEAD(&ss->ssl3.hs.lastMessageFlight);
+	 msg_p != &ss->ssl3.hs.lastMessageFlight;
 	 msg_p = PR_NEXT_LINK(msg_p)) {
         DTLSQueuedMessage *msg = (DTLSQueuedMessage *)msg_p;

[commit-bot: I haz the power, 2012-11-13 14:44:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/wtc@chromium.org/11275240/23025

[commit-bot: I haz the power, 2012-11-13 14:44:41]

Failed to apply patch for net/third_party/nss/ssl/dtlscon.c:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file net/third_party/nss/ssl/dtlscon.c
  Hunk #1 FAILED at 1.
  Hunk #2 FAILED at 286.
  Hunk #3 FAILED at 453.
  Hunk #4 FAILED at 497.
  Hunk #5 FAILED at 623.
  5 out of 5 hunks FAILED -- saving rejects to file
net/third_party/nss/ssl/dtlscon.c.rej

Patch:   N   net/third_party/nss/ssl/dtlscon.c
Index: net/third_party/nss/ssl/dtlscon.c
===================================================================
--- net/third_party/nss/ssl/dtlscon.c	(revision 166942)
+++ net/third_party/nss/ssl/dtlscon.c	(working copy)
@@ -1,43 +1,11 @@
+/* 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/. */
+
 /*
  * DTLS Protocol
- *
- * ***** 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) 1994-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Eric Rescorla <ekr@rtfm.com>
- *
- * 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: $ */
+ */
+/* $Id: dtlscon.c,v 1.5 2012/09/28 01:46:45 wtc%google.com Exp $ */
 
 #include "ssl.h"
 #include "sslimpl.h"
@@ -286,7 +254,7 @@
 
             /* At this point we are advancing our state machine, so
              * we can free our last flight of messages */
-            dtls_FreeHandshakeMessages(ss->ssl3.hs.lastMessageFlight);
+            dtls_FreeHandshakeMessages(&ss->ssl3.hs.lastMessageFlight);
 	    ss->ssl3.hs.recvdHighWater = -1;
 	    dtls_CancelTimer(ss);
 
@@ -453,7 +421,7 @@
 
 		    /* At this point we are advancing our state machine, so
 		     * we can free our last flight of messages */
-		    dtls_FreeHandshakeMessages(ss->ssl3.hs.lastMessageFlight);
+		    dtls_FreeHandshakeMessages(&ss->ssl3.hs.lastMessageFlight);
 		    dtls_CancelTimer(ss);
 
 		    /* If there have been no retries this time, reset the
@@ -497,7 +465,7 @@
 	PORT_SetError(SEC_ERROR_NO_MEMORY);
 	rv = SECFailure;
     } else {
-	PR_APPEND_LINK(&msg->link, ss->ssl3.hs.lastMessageFlight);
+	PR_APPEND_LINK(&msg->link, &ss->ssl3.hs.lastMessageFlight);
     }
 
     return rv;
@@ -623,8 +591,8 @@
      * stuffed something in ss->pendingBuf
      */
     PORT_Assert(!ss->pendingBuf.len);
-    for (msg_p = PR_LIST_HEAD(ss->ssl3.hs.lastMessageFlight);
-	 msg_p != ss->ssl3.hs.lastMessageFlight;
+    for (msg_p = PR_LIST_HEAD(&ss->ssl3.hs.lastMessageFlight);
+	 msg_p != &ss->ssl3.hs.lastMessageFlight;
 	 msg_p = PR_NEXT_LINK(msg_p)) {
         DTLSQueuedMessage *msg = (DTLSQueuedMessage *)msg_p;