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

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

Issue 1422573008: Plumbing SSLPrivateKey (//net) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing un-needed forward decl. Created 5 years, 1 month 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_client_auth_cache_unittest.cc ('k') | net/ssl/ssl_platform_key.h » ('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"
11 #include "net/base/net_export.h" 11 #include "net/base/net_export.h"
12 #include "net/cert/x509_certificate.h" 12 #include "net/cert/x509_certificate.h"
13 #include "net/socket/next_proto.h" 13 #include "net/socket/next_proto.h"
14 #include "net/ssl/ssl_private_key.h"
14 15
15 namespace net { 16 namespace net {
16 17
17 // Various TLS/SSL ProtocolVersion values encoded as uint16 18 // Various TLS/SSL ProtocolVersion values encoded as uint16
18 // struct { 19 // struct {
19 // uint8 major; 20 // uint8 major;
20 // uint8 minor; 21 // uint8 minor;
21 // } ProtocolVersion; 22 // } ProtocolVersion;
22 // The most significant byte is |major|, and the least significant byte 23 // The most significant byte is |major|, and the least significant byte
23 // is |minor|. 24 // is |minor|.
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 NextProtoVector npn_protos; 192 NextProtoVector npn_protos;
192 193
193 // True if renegotiation should be allowed for the default application-level 194 // True if renegotiation should be allowed for the default application-level
194 // protocol when the peer negotiates neither ALPN nor NPN. 195 // protocol when the peer negotiates neither ALPN nor NPN.
195 bool renego_allowed_default; 196 bool renego_allowed_default;
196 197
197 // The list of application-level protocols to enable renegotiation for. 198 // The list of application-level protocols to enable renegotiation for.
198 NextProtoVector renego_allowed_for_protos; 199 NextProtoVector renego_allowed_for_protos;
199 200
200 scoped_refptr<X509Certificate> client_cert; 201 scoped_refptr<X509Certificate> client_cert;
202 scoped_refptr<SSLPrivateKey> client_private_key;
201 }; 203 };
202 204
203 } // namespace net 205 } // namespace net
204 206
205 #endif // NET_SSL_SSL_CONFIG_H_ 207 #endif // NET_SSL_SSL_CONFIG_H_
OLDNEW
« no previous file with comments | « net/ssl/ssl_client_auth_cache_unittest.cc ('k') | net/ssl/ssl_platform_key.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698