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

Side by Side Diff: net/test/spawned_test_server/base_test_server.cc

Issue 83333003: Add support for fetching Certificate Transparency SCTs over a TLS extension (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update tlslite patch 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/test/spawned_test_server/base_test_server.h" 5 #include "net/test/spawned_test_server/base_test_server.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 scoped_ptr<base::ListValue> bulk_cipher_values(new base::ListValue()); 391 scoped_ptr<base::ListValue> bulk_cipher_values(new base::ListValue());
392 GetCiphersList(ssl_options_.bulk_ciphers, bulk_cipher_values.get()); 392 GetCiphersList(ssl_options_.bulk_ciphers, bulk_cipher_values.get());
393 if (bulk_cipher_values->GetSize()) 393 if (bulk_cipher_values->GetSize())
394 arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release()); 394 arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release());
395 if (ssl_options_.record_resume) 395 if (ssl_options_.record_resume)
396 arguments->Set("https-record-resume", base::Value::CreateNullValue()); 396 arguments->Set("https-record-resume", base::Value::CreateNullValue());
397 if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) { 397 if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) {
398 arguments->Set("tls-intolerant", 398 arguments->Set("tls-intolerant",
399 new base::FundamentalValue(ssl_options_.tls_intolerant)); 399 new base::FundamentalValue(ssl_options_.tls_intolerant));
400 } 400 }
401 if (!ssl_options_.signed_cert_timestamps.empty()) {
402 arguments->SetString("signed-cert-timestamps",
403 ssl_options_.signed_cert_timestamps);
wtc 2013/11/26 22:46:12 An alternative design is to let ssl_options_.signe
ekasper 2013/11/27 14:09:04 That's much better, thanks! Done.
404 }
401 } 405 }
402 406
403 return GenerateAdditionalArguments(arguments); 407 return GenerateAdditionalArguments(arguments);
404 } 408 }
405 409
406 bool BaseTestServer::GenerateAdditionalArguments( 410 bool BaseTestServer::GenerateAdditionalArguments(
407 base::DictionaryValue* arguments) const { 411 base::DictionaryValue* arguments) const {
408 return true; 412 return true;
409 } 413 }
410 414
411 } // namespace net 415 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698