Add flags to python test server for channel id, extended master secret, and token binding

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 93 matching lines @@
   }
 
   base::FilePath src_dir;
   if (!PathService::Get(base::DIR_SOURCE_ROOT, &src_dir))
     return false;
 
   *local_certificates_dir = src_dir.Append(certificates_dir);
   return true;
 }
 
+void GetTokenBindingParams(std::vector<int> params, base::ListValue* values) {

[davidben, 2015/09/15 15:58:35]

Perhaps just have this return a scoped_ptr<base::ListValue>? Would probably be
slightly cleaner at the call site and right now this is more
"AppendTokenBindingParams".

(DictonaryValue has a scoped_ptr<Value> version of Set so you don't need to
.release() or anything.)

[nharper, 2015/09/15 23:49:19]

Done.

+  for (int param : params) {
+    values->Append(new base::FundamentalValue(param));
+  }
+}
+
 }  // namespace
 
 BaseTestServer::SSLOptions::SSLOptions()
     : server_certificate(CERT_OK),
       ocsp_status(OCSP_OK),
       cert_serial(0),
       request_client_certificate(false),
       key_exchanges(SSLOptions::KEY_EXCHANGE_ANY),
       bulk_ciphers(SSLOptions::BULK_CIPHER_ANY),
       record_resume(false),
       tls_intolerant(TLS_INTOLERANT_NONE),
       tls_intolerance_type(TLS_INTOLERANCE_ALERT),
       fallback_scsv_enabled(false),
       staple_ocsp_response(false),
       ocsp_server_unavailable(false),
       enable_npn(false),
-      alert_after_handshake(false) {
-}
+      alert_after_handshake(false),
+      disable_channel_id(false),
+      disable_extended_master_secret(false) {}
 
 BaseTestServer::SSLOptions::SSLOptions(
     BaseTestServer::SSLOptions::ServerCertificate cert)
     : server_certificate(cert),
       ocsp_status(OCSP_OK),
       cert_serial(0),
       request_client_certificate(false),
       key_exchanges(SSLOptions::KEY_EXCHANGE_ANY),
       bulk_ciphers(SSLOptions::BULK_CIPHER_ANY),
       record_resume(false),
@@ skipping 399 matching lines @@
     if (ssl_options_.staple_ocsp_response)
       arguments->Set("staple-ocsp-response", base::Value::CreateNullValue());
     if (ssl_options_.ocsp_server_unavailable) {
       arguments->Set("ocsp-server-unavailable",
                      base::Value::CreateNullValue());
     }
     if (ssl_options_.enable_npn)
       arguments->Set("enable-npn", base::Value::CreateNullValue());
     if (ssl_options_.alert_after_handshake)
       arguments->Set("alert-after-handshake", base::Value::CreateNullValue());
+
+    if (ssl_options_.disable_channel_id)
+      arguments->Set("disable-channel-id", base::Value::CreateNullValue());
+    if (ssl_options_.disable_extended_master_secret) {
+      arguments->Set("disable-extended-master-secret",
+                     base::Value::CreateNullValue());
+    }
+    if (!ssl_options_.supported_token_binding_params.empty()) {
+      scoped_ptr<base::ListValue> token_binding_params(new base::ListValue());
+      GetTokenBindingParams(ssl_options_.supported_token_binding_params,
+                            token_binding_params.get());
+      arguments->Set("token-binding-params", token_binding_params.release());
+    }
   }
 
   return GenerateAdditionalArguments(arguments);
 }
 
 bool BaseTestServer::GenerateAdditionalArguments(
     base::DictionaryValue* arguments) const {
   return true;
 }
 
 }  // namespace net