| 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 "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <shlobj.h> | 9 #include <shlobj.h> |
| 10 #endif | 10 #endif |
| (...skipping 6931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6942 const char* mac; | 6942 const char* mac; |
| 6943 bool is_aead; | 6943 bool is_aead; |
| 6944 SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, &is_aead, cipher_suite); | 6944 SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, &is_aead, cipher_suite); |
| 6945 return std::string(key_exchange).find("ECDSA") != std::string::npos; | 6945 return std::string(key_exchange).find("ECDSA") != std::string::npos; |
| 6946 } | 6946 } |
| 6947 | 6947 |
| 6948 } // namespace | 6948 } // namespace |
| 6949 | 6949 |
| 6950 // Test that ECDSA is disabled on Windows XP, where ECDSA certificates cannot be | 6950 // Test that ECDSA is disabled on Windows XP, where ECDSA certificates cannot be |
| 6951 // verified. | 6951 // verified. |
| 6952 TEST_F(HTTPSRequestTest, DisableECDSAOnXP) { | 6952 // Test seems flaky, see http://crbug.com/411827. |
| 6953 TEST_F(HTTPSRequestTest, DISABLED_DisableECDSAOnXP) { |
| 6953 if (base::win::GetVersion() >= base::win::VERSION_VISTA) { | 6954 if (base::win::GetVersion() >= base::win::VERSION_VISTA) { |
| 6954 LOG(INFO) << "Skipping test on this version."; | 6955 LOG(INFO) << "Skipping test on this version."; |
| 6955 return; | 6956 return; |
| 6956 } | 6957 } |
| 6957 | 6958 |
| 6958 SpawnedTestServer test_server( | 6959 SpawnedTestServer test_server( |
| 6959 SpawnedTestServer::TYPE_HTTPS, | 6960 SpawnedTestServer::TYPE_HTTPS, |
| 6960 SpawnedTestServer::kLocalhost, | 6961 SpawnedTestServer::kLocalhost, |
| 6961 base::FilePath(FILE_PATH_LITERAL("net/data/ssl"))); | 6962 base::FilePath(FILE_PATH_LITERAL("net/data/ssl"))); |
| 6962 ASSERT_TRUE(test_server.Start()); | 6963 ASSERT_TRUE(test_server.Start()); |
| (...skipping 1130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8093 | 8094 |
| 8094 EXPECT_FALSE(r->is_pending()); | 8095 EXPECT_FALSE(r->is_pending()); |
| 8095 EXPECT_EQ(1, d->response_started_count()); | 8096 EXPECT_EQ(1, d->response_started_count()); |
| 8096 EXPECT_FALSE(d->received_data_before_response()); | 8097 EXPECT_FALSE(d->received_data_before_response()); |
| 8097 EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size)); | 8098 EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size)); |
| 8098 } | 8099 } |
| 8099 } | 8100 } |
| 8100 #endif // !defined(DISABLE_FTP_SUPPORT) | 8101 #endif // !defined(DISABLE_FTP_SUPPORT) |
| 8101 | 8102 |
| 8102 } // namespace net | 8103 } // namespace net |
| OLD | NEW |