net: add test for TLS_FALLBACK_SCSV

net/test/spawned_test_server/base_test_server.cc

 // Copyright 2013 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/spawned_test_server/base_test_server.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 42 matching lines @@
 
 }  // namespace
 
 BaseTestServer::SSLOptions::SSLOptions()
     : server_certificate(CERT_OK),
       ocsp_status(OCSP_OK),
       cert_serial(0),
       request_client_certificate(false),
       bulk_ciphers(SSLOptions::BULK_CIPHER_ANY),
       record_resume(false),
-      tls_intolerant(TLS_INTOLERANT_NONE) {}
+      tls_intolerant(TLS_INTOLERANT_NONE),
+      fallback_scsv_enabled(false) {}
 
 BaseTestServer::SSLOptions::SSLOptions(
     BaseTestServer::SSLOptions::ServerCertificate cert)
     : server_certificate(cert),
       ocsp_status(OCSP_OK),
       cert_serial(0),
       request_client_certificate(false),
       bulk_ciphers(SSLOptions::BULK_CIPHER_ANY),
       record_resume(false),
-      tls_intolerant(TLS_INTOLERANT_NONE) {}
+      tls_intolerant(TLS_INTOLERANT_NONE),
+      fallback_scsv_enabled(false) {}
 
 BaseTestServer::SSLOptions::~SSLOptions() {}
 
 base::FilePath BaseTestServer::SSLOptions::GetCertificateFile() const {
   switch (server_certificate) {
     case CERT_OK:
     case CERT_MISMATCHED_NAME:
       return base::FilePath(FILE_PATH_LITERAL("ok_cert.pem"));
     case CERT_EXPIRED:
       return base::FilePath(FILE_PATH_LITERAL("expired_cert.pem"));
@@ skipping 313 matching lines @@
     if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) {
       arguments->Set("tls-intolerant",
                      new base::FundamentalValue(ssl_options_.tls_intolerant));
     }
     if (!ssl_options_.signed_cert_timestamps.empty()) {
       std::string b64_scts;
       if (!base::Base64Encode(ssl_options_.signed_cert_timestamps, &b64_scts))
         return false;
       arguments->SetString("signed-cert-timestamps", b64_scts);
     }
+    if (ssl_options_.fallback_scsv_enabled)
+      arguments->Set("fallback-scsv", base::Value::CreateNullValue());

[wtc, 2013/12/10 16:28:27]

It would be nice to move this up, to follow the tls_intolerant code. (See my
comment in base_test_server.h about avoiding merge conflicts with Emilia's CL.)

[agl, 2013/12/10 17:53:43]

Done.

   }
 
   return GenerateAdditionalArguments(arguments);
 }
 
 bool BaseTestServer::GenerateAdditionalArguments(
     base::DictionaryValue* arguments) const {
   return true;
 }
 
 }  // namespace net