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

Side by Side Diff: net/socket/ssl_client_socket_openssl.h

Issue 257513008: Populate cert_key_types on OpenSSL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: USE_OPENSSL_CERTS Created 6 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "net/base/completion_callback.h" 13 #include "net/base/completion_callback.h"
14 #include "net/base/io_buffer.h" 14 #include "net/base/io_buffer.h"
15 #include "net/cert/cert_verify_result.h" 15 #include "net/cert/cert_verify_result.h"
16 #include "net/socket/client_socket_handle.h" 16 #include "net/socket/client_socket_handle.h"
17 #include "net/socket/ssl_client_socket.h" 17 #include "net/socket/ssl_client_socket.h"
18 #include "net/ssl/server_bound_cert_service.h" 18 #include "net/ssl/server_bound_cert_service.h"
19 #include "net/ssl/ssl_client_cert_type.h"
19 #include "net/ssl/ssl_config_service.h" 20 #include "net/ssl/ssl_config_service.h"
20 21
21 // Avoid including misc OpenSSL headers, i.e.: 22 // Avoid including misc OpenSSL headers, i.e.:
22 // <openssl/bio.h> 23 // <openssl/bio.h>
23 typedef struct bio_st BIO; 24 typedef struct bio_st BIO;
24 // <openssl/evp.h> 25 // <openssl/evp.h>
25 typedef struct evp_pkey_st EVP_PKEY; 26 typedef struct evp_pkey_st EVP_PKEY;
26 // <openssl/ssl.h> 27 // <openssl/ssl.h>
27 typedef struct ssl_st SSL; 28 typedef struct ssl_st SSL;
28 // <openssl/x509.h> 29 // <openssl/x509.h>
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 // Set when Read() or Write() successfully reads or writes data to or from the 191 // Set when Read() or Write() successfully reads or writes data to or from the
191 // network. 192 // network.
192 bool was_ever_used_; 193 bool was_ever_used_;
193 194
194 // Stores client authentication information between ClientAuthHandler and 195 // Stores client authentication information between ClientAuthHandler and
195 // GetSSLCertRequestInfo calls. 196 // GetSSLCertRequestInfo calls.
196 bool client_auth_cert_needed_; 197 bool client_auth_cert_needed_;
197 // List of DER-encoded X.509 DistinguishedName of certificate authorities 198 // List of DER-encoded X.509 DistinguishedName of certificate authorities
198 // allowed by the server. 199 // allowed by the server.
199 std::vector<std::string> cert_authorities_; 200 std::vector<std::string> cert_authorities_;
201 // List of certificate_type values for client certificates allowed by the
wtc 2014/04/25 18:52:40 Nit: "certificate_type" is a little confusing beca
davidben 2014/04/25 20:52:31 Done.
202 // server.
203 std::vector<SSLClientCertType> cert_key_types_;
wtc 2014/04/25 18:52:40 Nit: It seems better to name this member client_ce
davidben 2014/04/25 20:52:31 I named it cert_key_types mostly to match in name
200 204
201 CertVerifier* const cert_verifier_; 205 CertVerifier* const cert_verifier_;
202 scoped_ptr<SingleRequestCertVerifier> verifier_; 206 scoped_ptr<SingleRequestCertVerifier> verifier_;
203 207
204 // The service for retrieving Channel ID keys. May be NULL. 208 // The service for retrieving Channel ID keys. May be NULL.
205 ServerBoundCertService* server_bound_cert_service_; 209 ServerBoundCertService* server_bound_cert_service_;
206 210
207 // OpenSSL stuff 211 // OpenSSL stuff
208 SSL* ssl_; 212 SSL* ssl_;
209 BIO* transport_bio_; 213 BIO* transport_bio_;
(...skipping 27 matching lines...) Expand all
237 // True if channel ID extension was negotiated. 241 // True if channel ID extension was negotiated.
238 bool channel_id_xtn_negotiated_; 242 bool channel_id_xtn_negotiated_;
239 // The request handle for |server_bound_cert_service_|. 243 // The request handle for |server_bound_cert_service_|.
240 ServerBoundCertService::RequestHandle channel_id_request_handle_; 244 ServerBoundCertService::RequestHandle channel_id_request_handle_;
241 BoundNetLog net_log_; 245 BoundNetLog net_log_;
242 }; 246 };
243 247
244 } // namespace net 248 } // namespace net
245 249
246 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 250 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
OLDNEW
« no previous file with comments | « no previous file | net/socket/ssl_client_socket_openssl.cc » ('j') | net/socket/ssl_client_socket_openssl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698