Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Side by Side Diff: net/third_party/nss/ssl/sslsecur.c

Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make the changes rsleevi suggested Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Various SSL functions. 2 * Various SSL functions.
3 * 3 *
4 * This Source Code Form is subject to the terms of the Mozilla Public 4 * This Source Code Form is subject to the terms of the Mozilla Public
5 * License, v. 2.0. If a copy of the MPL was not distributed with this 5 * License, v. 2.0. If a copy of the MPL was not distributed with this
6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
7 /* $Id: sslsecur.c,v 1.61 2012/05/24 20:34:51 wtc%google.com Exp $ */ 7 /* $Id$ */
8 #include "cert.h" 8 #include "cert.h"
9 #include "secitem.h" 9 #include "secitem.h"
10 #include "keyhi.h" 10 #include "keyhi.h"
11 #include "ssl.h" 11 #include "ssl.h"
12 #include "sslimpl.h" 12 #include "sslimpl.h"
13 #include "sslproto.h" 13 #include "sslproto.h"
14 #include "secoid.h" /* for SECOID_GetALgorithmTag */ 14 #include "secoid.h" /* for SECOID_GetALgorithmTag */
15 #include "pk11func.h" /* for PK11_GenerateRandom */ 15 #include "pk11func.h" /* for PK11_GenerateRandom */
16 #include "nss.h" /* for NSS_RegisterShutdown */ 16 #include "nss.h" /* for NSS_RegisterShutdown */
17 #include "prinit.h" /* for PR_CallOnceWithArg */ 17 #include "prinit.h" /* for PR_CallOnceWithArg */
(...skipping 1572 matching lines...) Expand 10 before | Expand all | Expand 10 after
1590 if (!ss) { 1590 if (!ss) {
1591 SSL_DBG(("%d: SSL[%d]: bad socket in SNISocketConfigHook", 1591 SSL_DBG(("%d: SSL[%d]: bad socket in SNISocketConfigHook",
1592 SSL_GETPID(), fd)); 1592 SSL_GETPID(), fd));
1593 return SECFailure; 1593 return SECFailure;
1594 } 1594 }
1595 1595
1596 ss->sniSocketConfig = func; 1596 ss->sniSocketConfig = func;
1597 ss->sniSocketConfigArg = arg; 1597 ss->sniSocketConfigArg = arg;
1598 return SECSuccess; 1598 return SECSuccess;
1599 } 1599 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698