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

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

Issue 2348453002: Remove NPN from SSLConfig and SSLClientSocket*. (Closed)
Patch Set: Re: #7. Created 4 years, 3 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') | no next file » | 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 // intermediates or to perform OCSP/CRL fetches.) It also implies that online 164 // intermediates or to perform OCSP/CRL fetches.) It also implies that online
165 // revocation checking is disabled. 165 // revocation checking is disabled.
166 // NOTE: Only used by NSS. 166 // NOTE: Only used by NSS.
167 bool cert_io_enabled; 167 bool cert_io_enabled;
168 168
169 // The list of application level protocols supported with ALPN (Application 169 // The list of application level protocols supported with ALPN (Application
170 // Layer Protocol Negotation), in decreasing order of preference. Protocols 170 // Layer Protocol Negotation), in decreasing order of preference. Protocols
171 // will be advertised in this order during TLS handshake. 171 // will be advertised in this order during TLS handshake.
172 NextProtoVector alpn_protos; 172 NextProtoVector alpn_protos;
173 173
174 // The list of application level protocols supported with NPN (Next Protocol
175 // Negotiation). The last item on the list is selected if there is no overlap
176 // between |npn_protos| and the protocols supported by the server, otherwise
177 // server preference is observed and the order of |npn_protos| is irrelevant.
178 // Note that due to NSS limitations, ports which use NSS will use
179 // |alpn_protos| for both ALPN and NPN. However, if |npn_protos| is empty, NPN
180 // will still be disabled.
181 // TODO(bnc): Deprecate NPN, see https://crbug.com/526713.
182 NextProtoVector npn_protos;
183
184 // True if renegotiation should be allowed for the default application-level 174 // True if renegotiation should be allowed for the default application-level
185 // protocol when the peer negotiates neither ALPN nor NPN. 175 // protocol when the peer negotiates neither ALPN nor NPN.
186 bool renego_allowed_default; 176 bool renego_allowed_default;
187 177
188 // The list of application-level protocols to enable renegotiation for. 178 // The list of application-level protocols to enable renegotiation for.
189 NextProtoVector renego_allowed_for_protos; 179 NextProtoVector renego_allowed_for_protos;
190 180
191 scoped_refptr<X509Certificate> client_cert; 181 scoped_refptr<X509Certificate> client_cert;
192 scoped_refptr<SSLPrivateKey> client_private_key; 182 scoped_refptr<SSLPrivateKey> client_private_key;
193 }; 183 };
194 184
195 } // namespace net 185 } // namespace net
196 186
197 #endif // NET_SSL_SSL_CONFIG_H_ 187 #endif // NET_SSL_SSL_CONFIG_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698