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

Side by Side Diff: net/ssl/ssl_config.h

Issue 2653773003: Remove remnants of DHE support. (Closed)
Patch Set: adjust tests Created 3 years, 11 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/socket/ssl_client_socket_unittest.cc ('k') | net/ssl/ssl_config.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_SSL_SSL_CONFIG_H_ 5 #ifndef NET_SSL_SSL_CONFIG_H_
6 #define NET_SSL_SSL_CONFIG_H_ 6 #define NET_SSL_SSL_CONFIG_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 std::vector<uint16_t> disabled_cipher_suites; 96 std::vector<uint16_t> disabled_cipher_suites;
97 97
98 // Enables deprecated cipher suites. These cipher suites are selected under a 98 // Enables deprecated cipher suites. These cipher suites are selected under a
99 // fallback to distinguish servers which require them from servers which 99 // fallback to distinguish servers which require them from servers which
100 // merely prefer them. 100 // merely prefer them.
101 // 101 //
102 // NOTE: because they are under a fallback, connections are still vulnerable 102 // NOTE: because they are under a fallback, connections are still vulnerable
103 // to them as far as downgrades are concerned, so this should only be used for 103 // to them as far as downgrades are concerned, so this should only be used for
104 // measurement of ciphers not to be carried long-term. It is no fix for 104 // measurement of ciphers not to be carried long-term. It is no fix for
105 // servers with bad configurations without full removal. 105 // servers with bad configurations without full removal.
106 //
107 // TODO(davidben): This is no longer used. Remove
108 // it. https://crbug.com/684730.
106 bool deprecated_cipher_suites_enabled; 109 bool deprecated_cipher_suites_enabled;
107 110
108 // Enables DHE cipher suites.
109 bool dhe_enabled;
110
111 bool channel_id_enabled; // True if TLS channel ID extension is enabled. 111 bool channel_id_enabled; // True if TLS channel ID extension is enabled.
112 112
113 // List of Token Binding key parameters supported by the client. If empty, 113 // List of Token Binding key parameters supported by the client. If empty,
114 // Token Binding will be disabled, even if token_binding_enabled is true. 114 // Token Binding will be disabled, even if token_binding_enabled is true.
115 std::vector<TokenBindingParam> token_binding_params; 115 std::vector<TokenBindingParam> token_binding_params;
116 116
117 bool false_start_enabled; // True if we'll use TLS False Start. 117 bool false_start_enabled; // True if we'll use TLS False Start.
118 // True if the Certificate Transparency signed_certificate_timestamp 118 // True if the Certificate Transparency signed_certificate_timestamp
119 // TLS extension is enabled. 119 // TLS extension is enabled.
120 bool signed_cert_timestamps_enabled; 120 bool signed_cert_timestamps_enabled;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 // The list of application-level protocols to enable renegotiation for. 165 // The list of application-level protocols to enable renegotiation for.
166 NextProtoVector renego_allowed_for_protos; 166 NextProtoVector renego_allowed_for_protos;
167 167
168 scoped_refptr<X509Certificate> client_cert; 168 scoped_refptr<X509Certificate> client_cert;
169 scoped_refptr<SSLPrivateKey> client_private_key; 169 scoped_refptr<SSLPrivateKey> client_private_key;
170 }; 170 };
171 171
172 } // namespace net 172 } // namespace net
173 173
174 #endif // NET_SSL_SSL_CONFIG_H_ 174 #endif // NET_SSL_SSL_CONFIG_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | net/ssl/ssl_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698