Index: net/socket/ssl_client_socket_impl.cc |
diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc |
index 5cb4fbb552f17b82ccab3ccb383f84c521905352..f480646019b7eb49f5d6b2c0447641841cc1c93f 100644 |
--- a/net/socket/ssl_client_socket_impl.cc |
+++ b/net/socket/ssl_client_socket_impl.cc |
@@ -395,7 +395,9 @@ const SSL_PRIVATE_KEY_METHOD |
SSLClientSocketImpl::SSLContext::kPrivateKeyMethod = { |
&SSLClientSocketImpl::SSLContext::PrivateKeyTypeCallback, |
&SSLClientSocketImpl::SSLContext::PrivateKeyMaxSignatureLenCallback, |
+ NULL, |
&SSLClientSocketImpl::SSLContext::PrivateKeySignCallback, |
+ NULL, |
davidben
2016/07/18 09:46:40
[We'll want to wait for the roll which will includ
svaldez
2016/07/18 10:04:01
Done.
|
&SSLClientSocketImpl::SSLContext::PrivateKeySignCompleteCallback, |
}; |
@@ -2112,6 +2114,9 @@ std::string SSLClientSocketImpl::GetSessionCacheKey() const { |
case SSL_PROTOCOL_VERSION_TLS1_2: |
result.append("tls1.2"); |
break; |
+ case SSL_PROTOCOL_VERSION_TLS1_3: |
+ result.append("tls1.3"); |
+ break; |
default: |
NOTREACHED(); |
} |