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

Unified Diff: net/socket/ssl_client_socket.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/test_tools/crypto_test_utils_nss.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket.cc
diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc
index 4dd6a4e926d5a84f56076b94983fbc3c90774a68..94792cb1e7b9d9df5a5832fdc8b68ba0bed76c6d 100644
--- a/net/socket/ssl_client_socket.cc
+++ b/net/socket/ssl_client_socket.cc
@@ -143,6 +143,7 @@ void SSLClientSocket::RecordChannelIDSupport(
CLIENT_ONLY = 1,
CLIENT_AND_SERVER = 2,
CLIENT_NO_ECC = 3,
+ // CLIENT_BAD_SYSTEM_TIME is unused now.
CLIENT_BAD_SYSTEM_TIME = 4,
CLIENT_NO_CHANNEL_ID_SERVICE = 5,
CHANNEL_ID_USAGE_MAX
@@ -154,8 +155,6 @@ void SSLClientSocket::RecordChannelIDSupport(
supported = CLIENT_NO_CHANNEL_ID_SERVICE;
else if (!supports_ecc)
supported = CLIENT_NO_ECC;
- else if (!channel_id_service->IsSystemTimeValid())
- supported = CLIENT_BAD_SYSTEM_TIME;
else
supported = CLIENT_ONLY;
}
@@ -177,11 +176,6 @@ bool SSLClientSocket::IsChannelIDEnabled(
DVLOG(1) << "Elliptic Curve not supported, not enabling channel ID.";
return false;
}
- if (!channel_id_service->IsSystemTimeValid()) {
- DVLOG(1) << "System time is not within the supported range for certificate "
- "generation, not enabling channel ID.";
- return false;
- }
return true;
}
« no previous file with comments | « net/quic/test_tools/crypto_test_utils_nss.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698