OLD | NEW |
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 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 scoped_ptr<base::ListValue> bulk_cipher_values(new base::ListValue()); | 389 scoped_ptr<base::ListValue> bulk_cipher_values(new base::ListValue()); |
390 GetCiphersList(ssl_options_.bulk_ciphers, bulk_cipher_values.get()); | 390 GetCiphersList(ssl_options_.bulk_ciphers, bulk_cipher_values.get()); |
391 if (bulk_cipher_values->GetSize()) | 391 if (bulk_cipher_values->GetSize()) |
392 arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release()); | 392 arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release()); |
393 if (ssl_options_.record_resume) | 393 if (ssl_options_.record_resume) |
394 arguments->Set("https-record-resume", base::Value::CreateNullValue()); | 394 arguments->Set("https-record-resume", base::Value::CreateNullValue()); |
395 if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) { | 395 if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) { |
396 arguments->Set("tls-intolerant", | 396 arguments->Set("tls-intolerant", |
397 new base::FundamentalValue(ssl_options_.tls_intolerant)); | 397 new base::FundamentalValue(ssl_options_.tls_intolerant)); |
398 } | 398 } |
399 if (!ssl_options_.signed_cert_timestamps.empty()) { | 399 if (!ssl_options_.signed_cert_timestamps_tls_ext.empty()) { |
400 std::string b64_scts; | 400 std::string b64_scts_tls_ext; |
401 base::Base64Encode(ssl_options_.signed_cert_timestamps, &b64_scts); | 401 base::Base64Encode(ssl_options_.signed_cert_timestamps_tls_ext, |
402 arguments->SetString("signed-cert-timestamps", b64_scts); | 402 &b64_scts_tls_ext); |
| 403 arguments->SetString("signed-cert-timestamps-tls-ext", b64_scts_tls_ext); |
403 } | 404 } |
| 405 if (ssl_options_.staple_ocsp_response) |
| 406 arguments->Set("staple-ocsp-response", base::Value::CreateNullValue()); |
404 } | 407 } |
405 | 408 |
406 return GenerateAdditionalArguments(arguments); | 409 return GenerateAdditionalArguments(arguments); |
407 } | 410 } |
408 | 411 |
409 bool BaseTestServer::GenerateAdditionalArguments( | 412 bool BaseTestServer::GenerateAdditionalArguments( |
410 base::DictionaryValue* arguments) const { | 413 base::DictionaryValue* arguments) const { |
411 return true; | 414 return true; |
412 } | 415 } |
413 | 416 |
414 } // namespace net | 417 } // namespace net |
OLD | NEW |