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

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

Issue 1055683005: Revert of Require ECDHE for False Start. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months 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
« no previous file with comments | « net/ssl/ssl_cipher_suite_names.cc ('k') | net/test/spawned_test_server/base_test_server.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #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>
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 OCSP_UNAUTHORIZED, 72 OCSP_UNAUTHORIZED,
73 OCSP_UNKNOWN, 73 OCSP_UNKNOWN,
74 }; 74 };
75 75
76 // Bitmask of key exchange algorithms that the test server supports and that 76 // Bitmask of key exchange algorithms that the test server supports and that
77 // can be selectively enabled or disabled. 77 // can be selectively enabled or disabled.
78 enum KeyExchange { 78 enum KeyExchange {
79 // Special value used to indicate that any algorithm the server supports 79 // Special value used to indicate that any algorithm the server supports
80 // is acceptable. Preferred over explicitly OR-ing all key exchange 80 // is acceptable. Preferred over explicitly OR-ing all key exchange
81 // algorithms. 81 // algorithms.
82 KEY_EXCHANGE_ANY = 0, 82 KEY_EXCHANGE_ANY = 0,
83 83
84 KEY_EXCHANGE_RSA = (1 << 0), 84 KEY_EXCHANGE_RSA = (1 << 0),
85 KEY_EXCHANGE_DHE_RSA = (1 << 1), 85 KEY_EXCHANGE_DHE_RSA = (1 << 1),
86 KEY_EXCHANGE_ECDHE_RSA = (1 << 2),
87 }; 86 };
88 87
89 // Bitmask of bulk encryption algorithms that the test server supports 88 // Bitmask of bulk encryption algorithms that the test server supports
90 // and that can be selectively enabled or disabled. 89 // and that can be selectively enabled or disabled.
91 enum BulkCipher { 90 enum BulkCipher {
92 // Special value used to indicate that any algorithm the server supports 91 // Special value used to indicate that any algorithm the server supports
93 // is acceptable. Preferred over explicitly OR-ing all ciphers. 92 // is acceptable. Preferred over explicitly OR-ing all ciphers.
94 BULK_CIPHER_ANY = 0, 93 BULK_CIPHER_ANY = 0,
95 94
96 BULK_CIPHER_RC4 = (1 << 0), 95 BULK_CIPHER_RC4 = (1 << 0),
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 bool ws_basic_auth_; 327 bool ws_basic_auth_;
329 328
330 scoped_ptr<ScopedPortException> allowed_port_; 329 scoped_ptr<ScopedPortException> allowed_port_;
331 330
332 DISALLOW_COPY_AND_ASSIGN(BaseTestServer); 331 DISALLOW_COPY_AND_ASSIGN(BaseTestServer);
333 }; 332 };
334 333
335 } // namespace net 334 } // namespace net
336 335
337 #endif // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ 336 #endif // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_
OLDNEW
« no previous file with comments | « net/ssl/ssl_cipher_suite_names.cc ('k') | net/test/spawned_test_server/base_test_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698