diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 05:52:51 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 05:52:51 +0000 |
| commit | 7799de1ae747dcbd2e54f650539850fb6c139b1a (patch) | |
| tree | 68e30cfd82a1b9ee944ecbb922994589caac1a77 /net/ssl | |
| parent | e67140ee9ee65723732edb6a145b38030e142807 (diff) | |
| download | chromium_src-7799de1ae747dcbd2e54f650539850fb6c139b1a.zip chromium_src-7799de1ae747dcbd2e54f650539850fb6c139b1a.tar.gz chromium_src-7799de1ae747dcbd2e54f650539850fb6c139b1a.tar.bz2 | |
Implement TLS 1.2.
Patch by Adam Langley.
R=agl@chromium.org
BUG=90392
TEST=net_unittests
Review URL: https://chromiumcodereview.appspot.com/14772023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ssl')
| -rw-r--r-- | net/ssl/ssl_config_service.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ssl/ssl_config_service.cc b/net/ssl/ssl_config_service.cc index f195887..0561e7f 100644 --- a/net/ssl/ssl_config_service.cc +++ b/net/ssl/ssl_config_service.cc @@ -20,13 +20,15 @@ static uint16 g_default_version_min = SSL_PROTOCOL_VERSION_SSL3; static uint16 g_default_version_max = #if defined(USE_OPENSSL) -#if defined(SSL_OP_NO_TLSv1_1) +#if defined(SSL_OP_NO_TLSv1_2) + SSL_PROTOCOL_VERSION_TLS1_2; +#elif defined(SSL_OP_NO_TLSv1_1) SSL_PROTOCOL_VERSION_TLS1_1; #else SSL_PROTOCOL_VERSION_TLS1; #endif #else - SSL_PROTOCOL_VERSION_TLS1_1; + SSL_PROTOCOL_VERSION_TLS1_2; #endif SSLConfig::CertAndStatus::CertAndStatus() : cert_status(0) {} |