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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 ocsp_status(OCSP_OK), | 94 ocsp_status(OCSP_OK), |
95 cert_serial(0), | 95 cert_serial(0), |
96 request_client_certificate(false), | 96 request_client_certificate(false), |
97 key_exchanges(SSLOptions::KEY_EXCHANGE_ANY), | 97 key_exchanges(SSLOptions::KEY_EXCHANGE_ANY), |
98 bulk_ciphers(SSLOptions::BULK_CIPHER_ANY), | 98 bulk_ciphers(SSLOptions::BULK_CIPHER_ANY), |
99 record_resume(false), | 99 record_resume(false), |
100 tls_intolerant(TLS_INTOLERANT_NONE), | 100 tls_intolerant(TLS_INTOLERANT_NONE), |
101 tls_intolerance_type(TLS_INTOLERANCE_ALERT), | 101 tls_intolerance_type(TLS_INTOLERANCE_ALERT), |
102 fallback_scsv_enabled(false), | 102 fallback_scsv_enabled(false), |
103 staple_ocsp_response(false), | 103 staple_ocsp_response(false), |
104 enable_npn(false) {} | 104 enable_npn(false), |
| 105 none_session_cache(false) { |
| 106 } |
105 | 107 |
106 BaseTestServer::SSLOptions::SSLOptions( | 108 BaseTestServer::SSLOptions::SSLOptions( |
107 BaseTestServer::SSLOptions::ServerCertificate cert) | 109 BaseTestServer::SSLOptions::ServerCertificate cert) |
108 : server_certificate(cert), | 110 : server_certificate(cert), |
109 ocsp_status(OCSP_OK), | 111 ocsp_status(OCSP_OK), |
110 cert_serial(0), | 112 cert_serial(0), |
111 request_client_certificate(false), | 113 request_client_certificate(false), |
112 key_exchanges(SSLOptions::KEY_EXCHANGE_ANY), | 114 key_exchanges(SSLOptions::KEY_EXCHANGE_ANY), |
113 bulk_ciphers(SSLOptions::BULK_CIPHER_ANY), | 115 bulk_ciphers(SSLOptions::BULK_CIPHER_ANY), |
114 record_resume(false), | 116 record_resume(false), |
115 tls_intolerant(TLS_INTOLERANT_NONE), | 117 tls_intolerant(TLS_INTOLERANT_NONE), |
116 tls_intolerance_type(TLS_INTOLERANCE_ALERT), | 118 tls_intolerance_type(TLS_INTOLERANCE_ALERT), |
117 fallback_scsv_enabled(false), | 119 fallback_scsv_enabled(false), |
118 staple_ocsp_response(false), | 120 staple_ocsp_response(false), |
119 enable_npn(false) {} | 121 enable_npn(false), |
| 122 none_session_cache(false) { |
| 123 } |
120 | 124 |
121 BaseTestServer::SSLOptions::~SSLOptions() {} | 125 BaseTestServer::SSLOptions::~SSLOptions() {} |
122 | 126 |
123 base::FilePath BaseTestServer::SSLOptions::GetCertificateFile() const { | 127 base::FilePath BaseTestServer::SSLOptions::GetCertificateFile() const { |
124 switch (server_certificate) { | 128 switch (server_certificate) { |
125 case CERT_OK: | 129 case CERT_OK: |
126 case CERT_MISMATCHED_NAME: | 130 case CERT_MISMATCHED_NAME: |
127 return base::FilePath(FILE_PATH_LITERAL("ok_cert.pem")); | 131 return base::FilePath(FILE_PATH_LITERAL("ok_cert.pem")); |
128 case CERT_EXPIRED: | 132 case CERT_EXPIRED: |
129 return base::FilePath(FILE_PATH_LITERAL("expired_cert.pem")); | 133 return base::FilePath(FILE_PATH_LITERAL("expired_cert.pem")); |
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
467 if (!ssl_options_.signed_cert_timestamps_tls_ext.empty()) { | 471 if (!ssl_options_.signed_cert_timestamps_tls_ext.empty()) { |
468 std::string b64_scts_tls_ext; | 472 std::string b64_scts_tls_ext; |
469 base::Base64Encode(ssl_options_.signed_cert_timestamps_tls_ext, | 473 base::Base64Encode(ssl_options_.signed_cert_timestamps_tls_ext, |
470 &b64_scts_tls_ext); | 474 &b64_scts_tls_ext); |
471 arguments->SetString("signed-cert-timestamps-tls-ext", b64_scts_tls_ext); | 475 arguments->SetString("signed-cert-timestamps-tls-ext", b64_scts_tls_ext); |
472 } | 476 } |
473 if (ssl_options_.staple_ocsp_response) | 477 if (ssl_options_.staple_ocsp_response) |
474 arguments->Set("staple-ocsp-response", base::Value::CreateNullValue()); | 478 arguments->Set("staple-ocsp-response", base::Value::CreateNullValue()); |
475 if (ssl_options_.enable_npn) | 479 if (ssl_options_.enable_npn) |
476 arguments->Set("enable-npn", base::Value::CreateNullValue()); | 480 arguments->Set("enable-npn", base::Value::CreateNullValue()); |
| 481 if (ssl_options_.none_session_cache) |
| 482 arguments->Set("none-session-cache", base::Value::CreateNullValue()); |
477 } | 483 } |
478 | 484 |
479 return GenerateAdditionalArguments(arguments); | 485 return GenerateAdditionalArguments(arguments); |
480 } | 486 } |
481 | 487 |
482 bool BaseTestServer::GenerateAdditionalArguments( | 488 bool BaseTestServer::GenerateAdditionalArguments( |
483 base::DictionaryValue* arguments) const { | 489 base::DictionaryValue* arguments) const { |
484 return true; | 490 return true; |
485 } | 491 } |
486 | 492 |
487 } // namespace net | 493 } // namespace net |
OLD | NEW |