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

Side by Side Diff: net/third_party/nss/ssl/sslcon.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 * SSL v2 handshake functions, and functions common to SSL2 and SSL3. 2 * SSL v2 handshake functions, and functions common to SSL2 and SSL3.
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: sslcon.c,v 1.52 2012/07/17 14:43:11 kaie%kuix.de Exp $ */ 7 /* $Id$ */
8 8
9 #include "nssrenam.h" 9 #include "nssrenam.h"
10 #include "cert.h" 10 #include "cert.h"
11 #include "secitem.h" 11 #include "secitem.h"
12 #include "sechash.h" 12 #include "sechash.h"
13 #include "cryptohi.h" /* for SGN_ funcs */ 13 #include "cryptohi.h" /* for SGN_ funcs */
14 #include "keyhi.h" /* for SECKEY_ high level functions. */ 14 #include "keyhi.h" /* for SECKEY_ high level functions. */
15 #include "ssl.h" 15 #include "ssl.h"
16 #include "sslimpl.h" 16 #include "sslimpl.h"
17 #include "sslproto.h" 17 #include "sslproto.h"
(...skipping 3077 matching lines...) Expand 10 before | Expand all | Expand 10 after
3095 ss->version = SSL_LIBRARY_VERSION_3_0; 3095 ss->version = SSL_LIBRARY_VERSION_3_0;
3096 3096
3097 ssl_GetSSL3HandshakeLock(ss); 3097 ssl_GetSSL3HandshakeLock(ss);
3098 ssl_GetXmitBufLock(ss); 3098 ssl_GetXmitBufLock(ss);
3099 rv = ssl3_SendClientHello(ss, PR_FALSE); 3099 rv = ssl3_SendClientHello(ss, PR_FALSE);
3100 ssl_ReleaseXmitBufLock(ss); 3100 ssl_ReleaseXmitBufLock(ss);
3101 ssl_ReleaseSSL3HandshakeLock(ss); 3101 ssl_ReleaseSSL3HandshakeLock(ss);
3102 3102
3103 return rv; 3103 return rv;
3104 } 3104 }
3105 #if defined(NSS_ENABLE_ECC) && !defined(NSS_ECC_MORE_THAN_SUITE_B) 3105 #if defined(NSS_ENABLE_ECC)
3106 /* ensure we don't neogtiate ECC cipher suites with SSL2 hello */ 3106 /* ensure we don't neogtiate ECC cipher suites with SSL2 hello */
3107 ssl3_DisableECCSuites(ss, NULL); /* disable all ECC suites */ 3107 ssl3_DisableECCSuites(ss, NULL); /* disable all ECC suites */
3108 if (ss->cipherSpecs != NULL) { 3108 if (ss->cipherSpecs != NULL) {
3109 PORT_Free(ss->cipherSpecs); 3109 PORT_Free(ss->cipherSpecs);
3110 ss->cipherSpecs = NULL; 3110 ss->cipherSpecs = NULL;
3111 ss->sizeCipherSpecs = 0; 3111 ss->sizeCipherSpecs = 0;
3112 } 3112 }
3113 #endif 3113 #endif
3114 3114
3115 if (!ss->cipherSpecs) { 3115 if (!ss->cipherSpecs) {
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
3688 3688
3689 c = __nss_ssl_rcsid[0] + __nss_ssl_sccsid[0]; 3689 c = __nss_ssl_rcsid[0] + __nss_ssl_sccsid[0];
3690 return NSS_VersionCheck(importedVersion); 3690 return NSS_VersionCheck(importedVersion);
3691 } 3691 }
3692 3692
3693 const char * 3693 const char *
3694 NSSSSL_GetVersion(void) 3694 NSSSSL_GetVersion(void)
3695 { 3695 {
3696 return NSS_VERSION; 3696 return NSS_VERSION;
3697 } 3697 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698