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
Review URL: https://codereview.chromium.org/11275240

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167455 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 36 deletions

diff --git a/net/third_party/nss/ssl/sslerr.c b/net/third_party/nss/ssl/sslerr.c
index 2a40249..89f3c3b 100644
--- a/net/third_party/nss/ssl/sslerr.c
+++ b/net/third_party/nss/ssl/sslerr.c
@@ -2,42 +2,10 @@
  * Function to set error code only when meaningful error has not already 
  * been set.
  *
- * ***** 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):
- *
- * 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: sslerr.c,v 1.4 2004/04/27 23:04:39 gerv%gerv.net 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: sslerr.c,v 1.5 2012/04/25 14:50:12 gerv%gerv.net Exp $ */
 
 #include "prerror.h"
 #include "secerr.h"