summaryrefslogtreecommitdiffstats
path: root/net/test
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-20 16:28:44 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-20 16:28:44 +0000
commitd321e740903790ded4fb750f30649528216c3312 (patch)
tree2fc332a718d97a22249d84fe6f66b35bd8c76061 /net/test
parent3f768346a697fb927c7282bd2c72d7530804d3e2 (diff)
downloadchromium_src-d321e740903790ded4fb750f30649528216c3312.zip
chromium_src-d321e740903790ded4fb750f30649528216c3312.tar.gz
chromium_src-d321e740903790ded4fb750f30649528216c3312.tar.bz2
Regenerate the root certificate and end-entity certificates used for various tests in net_unittests, now that Windows can temporarily trust certificates for the duration of tests.
In addition, add unittests for net::TestRootCerts, which depend on the certs being tested not being trusted by the system beforehand. BUG=8470, 5552 TEST=TestRootCertsTest.* TBR=zelidrag Review URL: https://chromiumcodereview.appspot.com/5535006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207443 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
-rw-r--r--net/test/spawned_test_server/base_test_server.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
index d8ecc2f..4598128 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -296,7 +296,7 @@ bool BaseTestServer::LoadTestRootCert() const {
}
return root_certs->AddFromFile(
- root_certificate_path.AppendASCII("root_ca_cert.crt"));
+ root_certificate_path.AppendASCII("root_ca_cert.pem"));
}
bool BaseTestServer::SetupWhenServerStarted() {