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

Unified Diff: net/socket/ssl_client_socket.cc

Issue 1408813002: Remove crypto::ECPrivateKey::IsSupported. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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/socket/ssl_client_socket.h ('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 3472fd023f2aae650c253a8212de8c533dbc5c55..cf8f40aa5931ae30f2ae3401e1007e4b1a988508 100644
--- a/net/socket/ssl_client_socket.cc
+++ b/net/socket/ssl_client_socket.cc
@@ -127,14 +127,13 @@ void SSLClientSocket::RecordNegotiationExtension() {
void SSLClientSocket::RecordChannelIDSupport(
ChannelIDService* channel_id_service,
bool negotiated_channel_id,
- bool channel_id_enabled,
- bool supports_ecc) {
+ bool channel_id_enabled) {
// Since this enum is used for a histogram, do not change or re-use values.
enum {
DISABLED = 0,
CLIENT_ONLY = 1,
CLIENT_AND_SERVER = 2,
- CLIENT_NO_ECC = 3,
+ // CLIENT_NO_ECC is unused now.
Ryan Sleevi 2015/10/15 22:00:15 This doesn't match how CLIENT_BAD_SYSTEM_TIME was
// CLIENT_BAD_SYSTEM_TIME is unused now.
CLIENT_BAD_SYSTEM_TIME = 4,
CLIENT_NO_CHANNEL_ID_SERVICE = 5,
@@ -145,8 +144,6 @@ void SSLClientSocket::RecordChannelIDSupport(
} else if (channel_id_enabled) {
if (!channel_id_service)
supported = CLIENT_NO_CHANNEL_ID_SERVICE;
- else if (!supports_ecc)
- supported = CLIENT_NO_ECC;
else
supported = CLIENT_ONLY;
}
@@ -164,10 +161,6 @@ bool SSLClientSocket::IsChannelIDEnabled(
DVLOG(1) << "NULL channel_id_service_, not enabling channel ID.";
return false;
}
- if (!crypto::ECPrivateKey::IsSupported()) {
- DVLOG(1) << "Elliptic Curve not supported, not enabling channel ID.";
- return false;
- }
return true;
}
« no previous file with comments | « net/socket/ssl_client_socket.h ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698