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

Side by Side Diff: net/ssl/ssl_config_service.cc

Issue 14772023: Implement TLS 1.2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Move the assertion in sslplatf.c Created 7 years, 6 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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/ssl/ssl_config_service.h" 5 #include "net/ssl/ssl_config_service.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/synchronization/lock.h" 9 #include "base/synchronization/lock.h"
10 #include "net/cert/crl_set.h" 10 #include "net/cert/crl_set.h"
11 #include "net/ssl/ssl_config_service_defaults.h" 11 #include "net/ssl/ssl_config_service_defaults.h"
12 12
13 #if defined(USE_OPENSSL) 13 #if defined(USE_OPENSSL)
14 #include <openssl/ssl.h> 14 #include <openssl/ssl.h>
15 #endif 15 #endif
16 16
17 namespace net { 17 namespace net {
18 18
19 static uint16 g_default_version_min = SSL_PROTOCOL_VERSION_SSL3; 19 static uint16 g_default_version_min = SSL_PROTOCOL_VERSION_SSL3;
20 20
21 static uint16 g_default_version_max = 21 static uint16 g_default_version_max =
22 #if defined(USE_OPENSSL) 22 #if defined(USE_OPENSSL)
23 #if defined(SSL_OP_NO_TLSv1_1) 23 #if defined(SSL_OP_NO_TLSv1_2)
24 SSL_PROTOCOL_VERSION_TLS1_2;
25 #elif defined(SSL_OP_NO_TLSv1_1)
24 SSL_PROTOCOL_VERSION_TLS1_1; 26 SSL_PROTOCOL_VERSION_TLS1_1;
25 #else 27 #else
26 SSL_PROTOCOL_VERSION_TLS1; 28 SSL_PROTOCOL_VERSION_TLS1;
27 #endif 29 #endif
28 #else 30 #else
29 SSL_PROTOCOL_VERSION_TLS1_1; 31 SSL_PROTOCOL_VERSION_TLS1_2;
30 #endif 32 #endif
31 33
32 SSLConfig::CertAndStatus::CertAndStatus() : cert_status(0) {} 34 SSLConfig::CertAndStatus::CertAndStatus() : cert_status(0) {}
33 35
34 SSLConfig::CertAndStatus::~CertAndStatus() {} 36 SSLConfig::CertAndStatus::~CertAndStatus() {}
35 37
36 SSLConfig::SSLConfig() 38 SSLConfig::SSLConfig()
37 : rev_checking_enabled(false), 39 : rev_checking_enabled(false),
38 version_min(g_default_version_min), 40 version_min(g_default_version_min),
39 version_max(g_default_version_max), 41 version_max(g_default_version_max),
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 bool SSLConfigService::IsSNIAvailable(SSLConfigService* service) { 171 bool SSLConfigService::IsSNIAvailable(SSLConfigService* service) {
170 if (!service) 172 if (!service)
171 return false; 173 return false;
172 174
173 SSLConfig ssl_config; 175 SSLConfig ssl_config;
174 service->GetSSLConfig(&ssl_config); 176 service->GetSSLConfig(&ssl_config);
175 return ssl_config.version_max >= SSL_PROTOCOL_VERSION_TLS1; 177 return ssl_config.version_max >= SSL_PROTOCOL_VERSION_TLS1;
176 } 178 }
177 179
178 } // namespace net 180 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction_spdy3_unittest.cc ('k') | net/third_party/nss/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698