Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(453)

Unified Diff: net/test/spawned_test_server/base_test_server.cc

Issue 109563002: net: add test for TLS_FALLBACK_SCSV (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Typo fix. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/test/spawned_test_server/base_test_server.cc
diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
index 7ef2abaf1d177a3106199e357888bc5fd8f406fa..3b06a0ae2e8e045f392f74a6a00a8324d6ba0467 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -60,7 +60,8 @@ BaseTestServer::SSLOptions::SSLOptions()
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)
@@ -70,7 +71,8 @@ BaseTestServer::SSLOptions::SSLOptions(
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() {}
@@ -396,6 +398,8 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
arguments->Set("tls-intolerant",
new base::FundamentalValue(ssl_options_.tls_intolerant));
}
+ if (ssl_options_.fallback_scsv_enabled)
+ arguments->Set("fallback-scsv", base::Value::CreateNullValue());
if (!ssl_options_.signed_cert_timestamps.empty()) {
std::string b64_scts;
base::Base64Encode(ssl_options_.signed_cert_timestamps, &b64_scts);

Powered by Google App Engine
This is Rietveld 408576698