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 #ifndef NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ | 5 #ifndef NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ |
6 #define NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ | 6 #define NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "base/files/file_path.h" | 13 #include "base/files/file_path.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "net/base/host_port_pair.h" | 15 #include "net/base/host_port_pair.h" |
16 #include "net/ssl/ssl_client_cert_type.h" | |
16 | 17 |
17 class GURL; | 18 class GURL; |
18 | 19 |
19 namespace base { | 20 namespace base { |
20 class DictionaryValue; | 21 class DictionaryValue; |
21 } | 22 } |
22 | 23 |
23 namespace net { | 24 namespace net { |
24 | 25 |
25 class AddressList; | 26 class AddressList; |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
94 BULK_CIPHER_RC4 = (1 << 0), | 95 BULK_CIPHER_RC4 = (1 << 0), |
95 BULK_CIPHER_AES128 = (1 << 1), | 96 BULK_CIPHER_AES128 = (1 << 1), |
96 BULK_CIPHER_AES256 = (1 << 2), | 97 BULK_CIPHER_AES256 = (1 << 2), |
97 | 98 |
98 // NOTE: 3DES support in the Python test server has external | 99 // NOTE: 3DES support in the Python test server has external |
99 // dependencies and not be available on all machines. Clients may not | 100 // dependencies and not be available on all machines. Clients may not |
100 // be able to connect if only 3DES is specified. | 101 // be able to connect if only 3DES is specified. |
101 BULK_CIPHER_3DES = (1 << 3), | 102 BULK_CIPHER_3DES = (1 << 3), |
102 }; | 103 }; |
103 | 104 |
105 enum ClientKeyType { | |
wtc
2014/04/25 18:52:40
Nit: I suggest naming this type "ClientCertType" b
davidben
2014/04/25 20:52:31
Oops. Removed.
| |
106 // Special value used to indicate the default setting (rsa_sign). | |
107 CLIENT_KEY_TYPE_DEFAULT = 0, | |
108 | |
109 CLIENT_KEY_TYPE_RSA_SIGN = (1 << 0), | |
110 CLIENT_KEY_TYPE_DSS_SIGN = (1 << 1), | |
111 CLIENT_KEY_TYPE_ECDSA_SIGN = (1 << 2), | |
112 }; | |
113 | |
104 // NOTE: the values of these enumerators are passed to the the Python test | 114 // NOTE: the values of these enumerators are passed to the the Python test |
105 // server. Do not change them. | 115 // server. Do not change them. |
106 enum TLSIntolerantLevel { | 116 enum TLSIntolerantLevel { |
107 TLS_INTOLERANT_NONE = 0, | 117 TLS_INTOLERANT_NONE = 0, |
108 TLS_INTOLERANT_ALL = 1, // Intolerant of all TLS versions. | 118 TLS_INTOLERANT_ALL = 1, // Intolerant of all TLS versions. |
109 TLS_INTOLERANT_TLS1_1 = 2, // Intolerant of TLS 1.1 or higher. | 119 TLS_INTOLERANT_TLS1_1 = 2, // Intolerant of TLS 1.1 or higher. |
110 TLS_INTOLERANT_TLS1_2 = 3, // Intolerant of TLS 1.2 or higher. | 120 TLS_INTOLERANT_TLS1_2 = 3, // Intolerant of TLS 1.2 or higher. |
111 }; | 121 }; |
112 | 122 |
113 // Initialize a new SSLOptions using CERT_OK as the certificate. | 123 // Initialize a new SSLOptions using CERT_OK as the certificate. |
(...skipping 25 matching lines...) Expand all Loading... | |
139 // True if a CertificateRequest should be sent to the client during | 149 // True if a CertificateRequest should be sent to the client during |
140 // handshaking. | 150 // handshaking. |
141 bool request_client_certificate; | 151 bool request_client_certificate; |
142 | 152 |
143 // If |request_client_certificate| is true, an optional list of files, | 153 // If |request_client_certificate| is true, an optional list of files, |
144 // each containing a single, PEM-encoded X.509 certificates. The subject | 154 // each containing a single, PEM-encoded X.509 certificates. The subject |
145 // from each certificate will be added to the certificate_authorities | 155 // from each certificate will be added to the certificate_authorities |
146 // field of the CertificateRequest. | 156 // field of the CertificateRequest. |
147 std::vector<base::FilePath> client_authorities; | 157 std::vector<base::FilePath> client_authorities; |
148 | 158 |
159 // If |request_client_certificate| is true, an optional list of | |
160 // SSLClientCertType values to populate the certificate_types field of the | |
161 // CertificateRequest. | |
162 std::vector<SSLClientCertType> client_cert_types; | |
163 | |
149 // A bitwise-OR of KeyExchnage that should be used by the | 164 // A bitwise-OR of KeyExchnage that should be used by the |
150 // HTTPS server, or KEY_EXCHANGE_ANY to indicate that all implemented | 165 // HTTPS server, or KEY_EXCHANGE_ANY to indicate that all implemented |
151 // key exchange algorithms are acceptable. | 166 // key exchange algorithms are acceptable. |
152 int key_exchanges; | 167 int key_exchanges; |
153 | 168 |
154 // A bitwise-OR of BulkCipher that should be used by the | 169 // A bitwise-OR of BulkCipher that should be used by the |
155 // HTTPS server, or BULK_CIPHER_ANY to indicate that all implemented | 170 // HTTPS server, or BULK_CIPHER_ANY to indicate that all implemented |
156 // ciphers are acceptable. | 171 // ciphers are acceptable. |
157 int bulk_ciphers; | 172 int bulk_ciphers; |
158 | 173 |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
291 bool log_to_console_; | 306 bool log_to_console_; |
292 | 307 |
293 scoped_ptr<ScopedPortException> allowed_port_; | 308 scoped_ptr<ScopedPortException> allowed_port_; |
294 | 309 |
295 DISALLOW_COPY_AND_ASSIGN(BaseTestServer); | 310 DISALLOW_COPY_AND_ASSIGN(BaseTestServer); |
296 }; | 311 }; |
297 | 312 |
298 } // namespace net | 313 } // namespace net |
299 | 314 |
300 #endif // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ | 315 #endif // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ |
OLD | NEW |