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

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

Issue 12035105: Move client certificates retrieval logic out of the SSL sockets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing license header Created 7 years, 10 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_nss.cc ('k') | net/socket/ssl_client_socket_openssl.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 (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"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 scoped_refptr<X509Certificate> server_cert_; 144 scoped_refptr<X509Certificate> server_cert_;
145 CertVerifyResult server_cert_verify_result_; 145 CertVerifyResult server_cert_verify_result_;
146 bool completed_handshake_; 146 bool completed_handshake_;
147 147
148 // Stores client authentication information between ClientAuthHandler and 148 // Stores client authentication information between ClientAuthHandler and
149 // GetSSLCertRequestInfo calls. 149 // GetSSLCertRequestInfo calls.
150 bool client_auth_cert_needed_; 150 bool client_auth_cert_needed_;
151 // List of DER-encoded X.509 DistinguishedName of certificate authorities 151 // List of DER-encoded X.509 DistinguishedName of certificate authorities
152 // allowed by the server. 152 // allowed by the server.
153 std::vector<std::string> cert_authorities_; 153 std::vector<std::string> cert_authorities_;
154 // Set of certificates that matches the server criteria. This should be
155 // removed soon as being tracked in http://crbug.com/166642.
156 std::vector<scoped_refptr<X509Certificate> > client_certs_;
157 154
158 CertVerifier* const cert_verifier_; 155 CertVerifier* const cert_verifier_;
159 scoped_ptr<SingleRequestCertVerifier> verifier_; 156 scoped_ptr<SingleRequestCertVerifier> verifier_;
160 157
161 // OpenSSL stuff 158 // OpenSSL stuff
162 SSL* ssl_; 159 SSL* ssl_;
163 BIO* transport_bio_; 160 BIO* transport_bio_;
164 161
165 scoped_ptr<ClientSocketHandle> transport_; 162 scoped_ptr<ClientSocketHandle> transport_;
166 const HostPortPair host_and_port_; 163 const HostPortPair host_and_port_;
(...skipping 15 matching lines...) Expand all
182 State next_handshake_state_; 179 State next_handshake_state_;
183 NextProtoStatus npn_status_; 180 NextProtoStatus npn_status_;
184 std::string npn_proto_; 181 std::string npn_proto_;
185 std::string server_protos_; 182 std::string server_protos_;
186 BoundNetLog net_log_; 183 BoundNetLog net_log_;
187 }; 184 };
188 185
189 } // namespace net 186 } // namespace net
190 187
191 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 188 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_nss.cc ('k') | net/socket/ssl_client_socket_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698