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

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

Issue 92443002: Extract Certificate Transparency SCTs from stapled OCSP responses (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@extract_scts
Patch Set: fix format errors 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 3b06a0ae2e8e045f392f74a6a00a8324d6ba0467..ac37c70d21cb21c348451b7675ac748578f4cda0 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -61,7 +61,8 @@ BaseTestServer::SSLOptions::SSLOptions()
bulk_ciphers(SSLOptions::BULK_CIPHER_ANY),
record_resume(false),
tls_intolerant(TLS_INTOLERANT_NONE),
- fallback_scsv_enabled(false) {}
+ fallback_scsv_enabled(false),
+ staple_ocsp_response(false) {}
BaseTestServer::SSLOptions::SSLOptions(
BaseTestServer::SSLOptions::ServerCertificate cert)
@@ -72,7 +73,8 @@ BaseTestServer::SSLOptions::SSLOptions(
bulk_ciphers(SSLOptions::BULK_CIPHER_ANY),
record_resume(false),
tls_intolerant(TLS_INTOLERANT_NONE),
- fallback_scsv_enabled(false) {}
+ fallback_scsv_enabled(false),
+ staple_ocsp_response(false) {}
BaseTestServer::SSLOptions::~SSLOptions() {}
@@ -400,11 +402,14 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
}
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);
- arguments->SetString("signed-cert-timestamps", b64_scts);
+ if (!ssl_options_.signed_cert_timestamps_tls_ext.empty()) {
+ std::string b64_scts_tls_ext;
+ base::Base64Encode(ssl_options_.signed_cert_timestamps_tls_ext,
+ &b64_scts_tls_ext);
+ arguments->SetString("signed-cert-timestamps-tls-ext", b64_scts_tls_ext);
}
+ if (ssl_options_.staple_ocsp_response)
+ arguments->Set("staple-ocsp-response", base::Value::CreateNullValue());
}
return GenerateAdditionalArguments(arguments);

Powered by Google App Engine
This is Rietveld 408576698