Index: net/socket/ssl_client_socket_openssl.h |
diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h |
index 5d70c0523fabe0230b2361f7418688f1215fe0df..ac85483c4e370bc08287309abcba64353f8a5631 100644 |
--- a/net/socket/ssl_client_socket_openssl.h |
+++ b/net/socket/ssl_client_socket_openssl.h |
@@ -110,6 +110,8 @@ class SSLClientSocketOpenSSL : public SSLClientSocket { |
bool DoTransportIO(); |
int DoHandshake(); |
+ int DoChannelIDLookup(); |
+ int DoChannelIDLookupComplete(int result); |
int DoVerifyCert(int result); |
int DoVerifyCertComplete(int result); |
void DoConnectCallback(int result); |
@@ -136,10 +138,6 @@ class SSLClientSocketOpenSSL : public SSLClientSocket { |
// a certificate for this client. |
int ClientCertRequestCallback(SSL* ssl, X509** x509, EVP_PKEY** pkey); |
- // Callback from the SSL layer that indicates the remote server supports TLS |
- // Channel IDs. |
- void ChannelIDRequestCallback(SSL* ssl, EVP_PKEY** pkey); |
- |
// CertVerifyCallback is called to verify the server's certificates. We do |
// verification after the handshake so this function only enforces that the |
// certificates don't change during renegotiation. |
@@ -226,6 +224,8 @@ class SSLClientSocketOpenSSL : public SSLClientSocket { |
enum State { |
STATE_NONE, |
STATE_HANDSHAKE, |
+ STATE_CHANNEL_ID_LOOKUP, |
+ STATE_CHANNEL_ID_LOOKUP_COMPLETE, |
STATE_VERIFY_CERT, |
STATE_VERIFY_CERT_COMPLETE, |
}; |
@@ -236,8 +236,6 @@ class SSLClientSocketOpenSSL : public SSLClientSocket { |
// Written by the |server_bound_cert_service_|. |
std::string channel_id_private_key_; |
std::string channel_id_cert_; |
- // The return value of the last call to |server_bound_cert_service_|. |
- int channel_id_request_return_value_; |
// True if channel ID extension was negotiated. |
bool channel_id_xtn_negotiated_; |
// The request handle for |server_bound_cert_service_|. |