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

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

Issue 1076063002: Remove certificates from Channel ID (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Udpate KeysEqual to fail if preconditions fail Created 5 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
« 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 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 STATE_HANDSHAKE_COMPLETE, 288 STATE_HANDSHAKE_COMPLETE,
289 STATE_CHANNEL_ID_LOOKUP, 289 STATE_CHANNEL_ID_LOOKUP,
290 STATE_CHANNEL_ID_LOOKUP_COMPLETE, 290 STATE_CHANNEL_ID_LOOKUP_COMPLETE,
291 STATE_VERIFY_CERT, 291 STATE_VERIFY_CERT,
292 STATE_VERIFY_CERT_COMPLETE, 292 STATE_VERIFY_CERT_COMPLETE,
293 }; 293 };
294 State next_handshake_state_; 294 State next_handshake_state_;
295 NextProtoStatus npn_status_; 295 NextProtoStatus npn_status_;
296 std::string npn_proto_; 296 std::string npn_proto_;
297 // Written by the |channel_id_service_|. 297 // Written by the |channel_id_service_|.
298 std::string channel_id_private_key_; 298 scoped_ptr<crypto::ECPrivateKey> channel_id_key_;
299 std::string channel_id_cert_;
300 // True if a channel ID was sent. 299 // True if a channel ID was sent.
301 bool channel_id_sent_; 300 bool channel_id_sent_;
302 // True if the initial handshake has completed. 301 // True if the initial handshake has completed.
303 bool handshake_completed_; 302 bool handshake_completed_;
304 // True if the initial handshake's certificate has been verified. 303 // True if the initial handshake's certificate has been verified.
305 bool certificate_verified_; 304 bool certificate_verified_;
306 // The request handle for |channel_id_service_|. 305 // The request handle for |channel_id_service_|.
307 ChannelIDService::RequestHandle channel_id_request_handle_; 306 ChannelIDService::RequestHandle channel_id_request_handle_;
308 SSLFailureState ssl_failure_state_; 307 SSLFailureState ssl_failure_state_;
309 308
310 TransportSecurityState* transport_security_state_; 309 TransportSecurityState* transport_security_state_;
311 310
312 CertPolicyEnforcer* const policy_enforcer_; 311 CertPolicyEnforcer* const policy_enforcer_;
313 312
314 // pinning_failure_log contains a message produced by 313 // pinning_failure_log contains a message produced by
315 // TransportSecurityState::CheckPublicKeyPins in the event of a 314 // TransportSecurityState::CheckPublicKeyPins in the event of a
316 // pinning failure. It is a (somewhat) human-readable string. 315 // pinning failure. It is a (somewhat) human-readable string.
317 std::string pinning_failure_log_; 316 std::string pinning_failure_log_;
318 317
319 BoundNetLog net_log_; 318 BoundNetLog net_log_;
320 base::WeakPtrFactory<SSLClientSocketOpenSSL> weak_factory_; 319 base::WeakPtrFactory<SSLClientSocketOpenSSL> weak_factory_;
321 }; 320 };
322 321
323 } // namespace net 322 } // namespace net
324 323
325 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 324 #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