| Index: net/cert/cert_verify_proc_unittest.cc
|
| diff --git a/net/cert/cert_verify_proc_unittest.cc b/net/cert/cert_verify_proc_unittest.cc
|
| index 3c6e345f47ee3aa5b7918d1ca0da279685282623..73f8fa3018017cb786469bed0c51774ec6db3844 100644
|
| --- a/net/cert/cert_verify_proc_unittest.cc
|
| +++ b/net/cert/cert_verify_proc_unittest.cc
|
| @@ -29,9 +29,7 @@
|
| #include "net/test/test_certificate_data.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -#if defined(OS_WIN)
|
| -#include "base/win/windows_version.h"
|
| -#elif defined(OS_ANDROID)
|
| +#if defined(OS_ANDROID)
|
| #include "base/android/build_info.h"
|
| #endif
|
|
|
| @@ -312,23 +310,6 @@ TEST_F(CertVerifyProcTest, RejectExpiredCert) {
|
| EXPECT_TRUE(verify_result.cert_status & CERT_STATUS_DATE_INVALID);
|
| }
|
|
|
| -// Test that verifying an ECDSA certificate doesn't crash on XP. (See
|
| -// crbug.com/144466).
|
| -TEST_F(CertVerifyProcTest, ECDSA_RSA) {
|
| - base::FilePath certs_dir = GetTestCertsDirectory();
|
| -
|
| - scoped_refptr<X509Certificate> cert =
|
| - ImportCertFromFile(certs_dir,
|
| - "prime256v1-ecdsa-ee-by-1024-rsa-intermediate.pem");
|
| -
|
| - CertVerifyResult verify_result;
|
| - Verify(cert.get(), "127.0.0.1", 0, NULL, empty_cert_list_, &verify_result);
|
| -
|
| - // We don't check verify_result because the certificate is signed by an
|
| - // unknown CA and will be considered invalid on XP because of the ECDSA
|
| - // public key.
|
| -}
|
| -
|
| // Currently, only RSA and DSA keys are checked for weakness, and our example
|
| // weak size is 768. These could change in the future.
|
| //
|
| @@ -357,14 +338,7 @@ TEST_F(CertVerifyProcTest, RejectWeakKeys) {
|
| key_types.push_back("768-rsa");
|
| key_types.push_back("1024-rsa");
|
| key_types.push_back("2048-rsa");
|
| -
|
| - bool use_ecdsa = true;
|
| -#if defined(OS_WIN)
|
| - use_ecdsa = base::win::GetVersion() > base::win::VERSION_XP;
|
| -#endif
|
| -
|
| - if (use_ecdsa)
|
| - key_types.push_back("prime256v1-ecdsa");
|
| + key_types.push_back("prime256v1-ecdsa");
|
|
|
| // Add the root that signed the intermediates for this test.
|
| scoped_refptr<X509Certificate> root_cert =
|
|
|