summaryrefslogtreecommitdiffstats
path: root/net/third_party/nss/ssl/sslerr.c
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-02 14:22:04 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-02 14:22:04 +0000
commitf97ed250a7e8b55c23fa5483526d0ce06725b055 (patch)
tree5e2ad81259eda18f325ef5fc9ff78943e43ed3fb /net/third_party/nss/ssl/sslerr.c
parent1b66763c1b983ad8d26f34d385924afbbe2c8104 (diff)
downloadchromium_src-f97ed250a7e8b55c23fa5483526d0ce06725b055.zip
chromium_src-f97ed250a7e8b55c23fa5483526d0ce06725b055.tar.gz
chromium_src-f97ed250a7e8b55c23fa5483526d0ce06725b055.tar.bz2
Update NSS libSSL to NSS_3_15_BETA2.
The OCSP stapling patch has been accepted by the NSS upstream, but the SSL_GetStapledOCSPResponse function is renamed SSL_PeerStapledOCSPResponses and the function prototype changed to use the new SECItemArray type. Many source files contain only a trivial CVS keyword change because the NSS upstream repository was migrated from CVS to hg (Mercurial). R=agl@chromium.org,rsleevi@chromium.org BUG=233732 TEST=no build errors or test failures Review URL: https://chromiumcodereview.appspot.com/14522022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party/nss/ssl/sslerr.c')
-rw-r--r--net/third_party/nss/ssl/sslerr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/third_party/nss/ssl/sslerr.c b/net/third_party/nss/ssl/sslerr.c
index 89f3c3b..0afdb18 100644
--- a/net/third_party/nss/ssl/sslerr.c
+++ b/net/third_party/nss/ssl/sslerr.c
@@ -5,7 +5,7 @@
* 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 $ */
+/* $Id$ */
#include "prerror.h"
#include "secerr.h"