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

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

Issue 1304143010: Plumbing SSLPrivateKey Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 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
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 "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "net/base/net_export.h" 10 #include "net/base/net_export.h"
11 #include "net/cert/x509_certificate.h" 11 #include "net/cert/x509_certificate.h"
12 #include "net/socket/next_proto.h" 12 #include "net/socket/next_proto.h"
13 #include "net/ssl/ssl_private_key.h"
13 14
14 namespace net { 15 namespace net {
15 16
16 // Various TLS/SSL ProtocolVersion values encoded as uint16 17 // Various TLS/SSL ProtocolVersion values encoded as uint16
17 // struct { 18 // struct {
18 // uint8 major; 19 // uint8 major;
19 // uint8 minor; 20 // uint8 minor;
20 // } ProtocolVersion; 21 // } ProtocolVersion;
21 // The most significant byte is |major|, and the least significant byte 22 // The most significant byte is |major|, and the least significant byte
22 // is |minor|. 23 // is |minor|.
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 NextProtoVector next_protos; 163 NextProtoVector next_protos;
163 164
164 // True if renegotiation should be allowed for the default application-level 165 // True if renegotiation should be allowed for the default application-level
165 // protocol when the peer negotiates neither ALPN nor NPN. 166 // protocol when the peer negotiates neither ALPN nor NPN.
166 bool renego_allowed_default; 167 bool renego_allowed_default;
167 168
168 // The list of application-level protocols to enable renegotiation for. 169 // The list of application-level protocols to enable renegotiation for.
169 NextProtoVector renego_allowed_for_protos; 170 NextProtoVector renego_allowed_for_protos;
170 171
171 scoped_refptr<X509Certificate> client_cert; 172 scoped_refptr<X509Certificate> client_cert;
173 scoped_refptr<SSLPrivateKey> client_pkey;
davidben 2015/09/25 20:10:11 I don't have a strong opinion, but 'pkey' is sort
svaldez 2015/09/28 16:54:53 Done.
172 }; 174 };
173 175
174 } // namespace net 176 } // namespace net
175 177
176 #endif // NET_SSL_SSL_CONFIG_H_ 178 #endif // NET_SSL_SSL_CONFIG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698