summaryrefslogtreecommitdiffstats
path: root/net/test/test_server.cc
diff options
context:
space:
mode:
authorpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-03 01:07:15 +0000
committerpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-03 01:07:15 +0000
commite54d0af33c053eb1a33876f232bbb224015cc37e (patch)
treea6db242cc5e32f4d245f558b6c2984d2e2de8a55 /net/test/test_server.cc
parent99af54b649fa2edc0b31b1f09608628420a1706b (diff)
downloadchromium_src-e54d0af33c053eb1a33876f232bbb224015cc37e.zip
chromium_src-e54d0af33c053eb1a33876f232bbb224015cc37e.tar.gz
chromium_src-e54d0af33c053eb1a33876f232bbb224015cc37e.tar.bz2
Provide the certificate chain as validated to SSLInfo.
Previously, SSLInfo was given the cert chain as served by the server. It is more useful and correct to provide higher layers the cert chain as validated. BUG=77757, 87303, 115312 TEST=net_unittests SSLClientSocketTest.VerifyReturnChainProperlyOrdered Review URL: http://codereview.chromium.org/9442001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test/test_server.cc')
-rw-r--r--net/test/test_server.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc
index f38abfa..3d95fb4 100644
--- a/net/test/test_server.cc
+++ b/net/test/test_server.cc
@@ -59,6 +59,10 @@ FilePath TestServer::HTTPSOptions::GetCertificateFile() const {
return FilePath(FILE_PATH_LITERAL("ok_cert.pem"));
case CERT_EXPIRED:
return FilePath(FILE_PATH_LITERAL("expired_cert.pem"));
+ case CERT_CHAIN_WRONG_ROOT:
+ // This chain uses its own dedicated test root certificate to avoid
+ // side-effects that may affect testing.
+ return FilePath(FILE_PATH_LITERAL("redundant-server-chain.pem"));
default:
NOTREACHED();
}