Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/socket/ssl_client_socket_impl.h" | 5 #include "net/socket/ssl_client_socket_impl.h" |
| 6 | 6 |
| 7 #include <errno.h> | 7 #include <errno.h> |
| 8 #include <openssl/bio.h> | 8 #include <openssl/bio.h> |
| 9 #include <openssl/bytestring.h> | 9 #include <openssl/bytestring.h> |
| 10 #include <openssl/err.h> | 10 #include <openssl/err.h> |
| (...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 967 SSL_set_mode(ssl_, mode.set_mask); | 967 SSL_set_mode(ssl_, mode.set_mask); |
| 968 SSL_clear_mode(ssl_, mode.clear_mask); | 968 SSL_clear_mode(ssl_, mode.clear_mask); |
| 969 | 969 |
| 970 // Use BoringSSL defaults, but disable HMAC-SHA256 and HMAC-SHA384 ciphers | 970 // Use BoringSSL defaults, but disable HMAC-SHA256 and HMAC-SHA384 ciphers |
| 971 // (note that SHA256 and SHA384 only select legacy CBC ciphers). Also disable | 971 // (note that SHA256 and SHA384 only select legacy CBC ciphers). Also disable |
| 972 // DHE_RSA_WITH_AES_256_GCM_SHA384. Historically, AES_256_GCM was not | 972 // DHE_RSA_WITH_AES_256_GCM_SHA384. Historically, AES_256_GCM was not |
| 973 // supported. As DHE is being deprecated, don't add a cipher only to remove it | 973 // supported. As DHE is being deprecated, don't add a cipher only to remove it |
| 974 // immediately. | 974 // immediately. |
| 975 std::string command; | 975 std::string command; |
| 976 #if !defined(OS_NACL) | 976 #if !defined(OS_NACL) |
| 977 if (base::FeatureList::IsEnabled(kPostQuantumExperiment)) { | 977 if (false && base::FeatureList::IsEnabled(kPostQuantumExperiment)) { |
|
Sergey Ulanov
2016/07/08 21:31:46
Shouldn't be part of this CL
Also Joe landed a fix
Hzj_jie
2016/07/10 22:04:57
Sorry, this change has been started before Joe's f
| |
| 978 // These are experimental, non-standard ciphersuites. They are part of an | 978 // These are experimental, non-standard ciphersuites. They are part of an |
| 979 // experiment in post-quantum cryptography. They're not intended to | 979 // experiment in post-quantum cryptography. They're not intended to |
| 980 // represent a de-facto standard, and will be removed from BoringSSL in | 980 // represent a de-facto standard, and will be removed from BoringSSL in |
| 981 // ~2018. | 981 // ~2018. |
| 982 if (EVP_has_aes_hardware()) { | 982 if (EVP_has_aes_hardware()) { |
| 983 command.append( | 983 command.append( |
| 984 "CECPQ1-RSA-AES256-GCM-SHA384:" | 984 "CECPQ1-RSA-AES256-GCM-SHA384:" |
| 985 "CECPQ1-ECDSA-AES256-GCM-SHA384:"); | 985 "CECPQ1-ECDSA-AES256-GCM-SHA384:"); |
| 986 } | 986 } |
| 987 command.append( | 987 command.append( |
| (...skipping 1329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2317 if (rv != OK) { | 2317 if (rv != OK) { |
| 2318 net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv); | 2318 net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv); |
| 2319 return; | 2319 return; |
| 2320 } | 2320 } |
| 2321 | 2321 |
| 2322 net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT, | 2322 net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT, |
| 2323 base::Bind(&NetLogSSLInfoCallback, base::Unretained(this))); | 2323 base::Bind(&NetLogSSLInfoCallback, base::Unretained(this))); |
| 2324 } | 2324 } |
| 2325 | 2325 |
| 2326 } // namespace net | 2326 } // namespace net |
| OLD | NEW |