diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 12:13:05 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 12:13:05 +0000 |
| commit | cff5dadeb1be4c526a1b3875c9acf422cbaf834d (patch) | |
| tree | da0c0f9f6ff4fd3ede6e5f9a694c13bf8ed8c036 /net/test | |
| parent | 589344c079be45268437f11e55f73fa9ca031d17 (diff) | |
| download | chromium_src-cff5dadeb1be4c526a1b3875c9acf422cbaf834d.zip chromium_src-cff5dadeb1be4c526a1b3875c9acf422cbaf834d.tar.gz chromium_src-cff5dadeb1be4c526a1b3875c9acf422cbaf834d.tar.bz2 | |
Support signatures in the policy test server.
Remove the old certificate-handling code and make the test server read a
private key file instead. Public key is sent to the client in PKCS#1/DER
format as required by the protocol.
BUG=None
TEST=manual
Review URL: http://codereview.chromium.org/6823004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
| -rw-r--r-- | net/test/test_server.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc index de55808..2b61ec6 100644 --- a/net/test/test_server.cc +++ b/net/test/test_server.cc @@ -17,8 +17,8 @@ #include "base/base64.h" #include "base/command_line.h" #include "base/debug/leak_annotations.h" -#include "base/json/json_reader.h" #include "base/file_util.h" +#include "base/json/json_reader.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" @@ -345,9 +345,6 @@ bool TestServer::AddCommandLineArguments(CommandLine* command_line) const { command_line->AppendSwitchASCII("port", base::IntToString(host_port_pair_.port())); command_line->AppendSwitchPath("data-dir", document_root_); - command_line->AppendSwitchPath("policy-cert-chain", - certificates_dir_.AppendASCII("ok_cert.pem")); - command_line->AppendSwitchPath("policy-cert-chain", GetRootCertificatePath()); if (logging::GetMinLogLevel() == logging::LOG_VERBOSE) { command_line->AppendArg("--log-to-console"); |