Remove Net.SSLSecureRenegotiation histogram
The histogram has expired and I don't currently have the cycles to chase
this one down. (On the client, the correct mitigation is to reject *all*
connections without renegotiation info, so this would only have been a
half-measure anyway.)
Bug: 975173
Change-Id: Ib64f4796abe057cf5df606c56926e45682d8cecc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1727093
Commit-Queue: David Benjamin <davidben@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Reviewed-by: Steven Valdez <svaldez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683429}
diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc
index f41357fb..2253e47 100644
--- a/net/socket/ssl_client_socket_impl.cc
+++ b/net/socket/ssl_client_socket_impl.cc
@@ -319,7 +319,6 @@
// Deduplicate all certificates minted from the SSL_CTX in memory.
SSL_CTX_set0_buffer_pool(ssl_ctx_.get(), x509_util::GetBufferPool());
- SSL_CTX_set_info_callback(ssl_ctx_.get(), InfoCallback);
SSL_CTX_set_msg_callback(ssl_ctx_.get(), MessageCallback);
#if !defined(NET_DISABLE_BROTLI)
@@ -390,11 +389,6 @@
GetInstance()->ssl_key_logger_->WriteLine(line);
}
- static void InfoCallback(const SSL* ssl, int type, int value) {
- SSLClientSocketImpl* socket = GetInstance()->GetClientSocketFromSSL(ssl);
- socket->InfoCallback(type, value);
- }
-
static void MessageCallback(int is_write,
int version,
int content_type,
@@ -1775,13 +1769,6 @@
RetryAllOperations();
}
-void SSLClientSocketImpl::InfoCallback(int type, int value) {
- if (type == SSL_CB_HANDSHAKE_START && completed_connect_) {
- UMA_HISTOGRAM_BOOLEAN("Net.SSLSecureRenegotiation",
- SSL_get_secure_renegotiation_support(ssl_.get()));
- }
-}
-
void SSLClientSocketImpl::MessageCallback(int is_write,
int content_type,
const void* buf,
diff --git a/net/socket/ssl_client_socket_impl.h b/net/socket/ssl_client_socket_impl.h
index a360025e..88bbc58 100644
--- a/net/socket/ssl_client_socket_impl.h
+++ b/net/socket/ssl_client_socket_impl.h
@@ -184,9 +184,6 @@
void OnPrivateKeyComplete(Error error, const std::vector<uint8_t>& signature);
- // Called from the BoringSSL info callback. (See |SSL_CTX_set_info_callback|.)
- void InfoCallback(int type, int value);
-
// Called whenever BoringSSL processes a protocol message.
void MessageCallback(int is_write,
int content_type,
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index ee525f7..de3367e 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -78347,6 +78347,9 @@
<histogram name="Net.SSLSecureRenegotiation" enum="BooleanSecure"
expires_after="M77">
+ <obsolete>
+ Removed in August 2019
+ </obsolete>
<owner>davidben@chromium.org</owner>
<summary>
For each attempted SSL renegotiation (non-initial handshake), whether the
