Add TLS-SRP (RFC 5054) support

net/test/test_server.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/test/test_server.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 44 matching lines @@
   }
 
   return "127.0.0.1";
 }
 
 }  // namespace
 
 TestServer::HTTPSOptions::HTTPSOptions()
     : server_certificate(CERT_OK),
       request_client_certificate(false),
-      bulk_ciphers(HTTPSOptions::BULK_CIPHER_ANY) {}
+      bulk_ciphers(HTTPSOptions::BULK_CIPHER_ANY),
+      use_tls_srp(0), only_tls_srp(0) {}
 
 TestServer::HTTPSOptions::HTTPSOptions(
     TestServer::HTTPSOptions::ServerCertificate cert)
     : server_certificate(cert),
       request_client_certificate(false),
-      bulk_ciphers(HTTPSOptions::BULK_CIPHER_ANY) {}
+      bulk_ciphers(HTTPSOptions::BULK_CIPHER_ANY),
+      use_tls_srp(0), only_tls_srp(0) {}
 
 TestServer::HTTPSOptions::~HTTPSOptions() {}
 
 FilePath TestServer::HTTPSOptions::GetCertificateFile() const {
   switch (server_certificate) {
     case CERT_OK:
     case CERT_MISMATCHED_NAME:
       return FilePath(FILE_PATH_LITERAL("ok_cert.pem"));
     case CERT_EXPIRED:
       return FilePath(FILE_PATH_LITERAL("expired_cert.pem"));
@@ skipping 18 matching lines @@
 }
 
 TestServer::~TestServer() {
   TestRootCerts* root_certs = TestRootCerts::GetInstance();
   root_certs->Clear();
   Stop();
 }
 
 bool TestServer::Start() {
   if (type_ == TYPE_HTTPS) {
-    if (!LoadTestRootCert())
+    if (!LoadTestRootCert()) {
+      LOG(ERROR) << "Failed to load test root cert";
       return false;
+    }
   }
 
   // Get path to python server script
   FilePath testserver_path;
   if (!PathService::Get(base::DIR_SOURCE_ROOT, &testserver_path)) {
     LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
     return false;
   }
   testserver_path = testserver_path
       .Append(FILE_PATH_LITERAL("net"))
       .Append(FILE_PATH_LITERAL("tools"))
       .Append(FILE_PATH_LITERAL("testserver"))
       .Append(FILE_PATH_LITERAL("testserver.py"));
 
-  if (!SetPythonPath())
+  if (!SetPythonPath()) {
+    LOG(ERROR) << "Failed to set Python path";
     return false;
+  }
 
-  if (!LaunchPython(testserver_path))
+  if (!LaunchPython(testserver_path)) {
+    LOG(ERROR) << "Failed to launch Python test server";
     return false;
+  }
 
   if (!WaitToStart()) {
     Stop();
+    LOG(ERROR) << "Failed in WaitToStart()";
     return false;
   }
 
   allowed_port_.reset(new ScopedPortException(host_port_pair_.port()));
 
   started_ = true;
   return true;
 }
 
 bool TestServer::Stop() {
@@ skipping 241 matching lines @@
 
     const char kBulkCipherSwitch[] = "ssl-bulk-cipher";
     if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_RC4)
       command_line->AppendSwitchASCII(kBulkCipherSwitch, "rc4");
     if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_AES128)
       command_line->AppendSwitchASCII(kBulkCipherSwitch, "aes128");
     if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_AES256)
       command_line->AppendSwitchASCII(kBulkCipherSwitch, "aes256");
     if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_3DES)
       command_line->AppendSwitchASCII(kBulkCipherSwitch, "3des");
+
+    if (https_options_.use_tls_srp)
+      command_line->AppendSwitch("use-tls-srp");
+    if (https_options_.only_tls_srp)
+      command_line->AppendSwitch("only-tls-srp");
   }
 
   return true;
 }
 
 }  // namespace net