summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2012-03-16 14:44:14 -0700
committerBrian Carlstrom <bdc@google.com>2012-03-16 15:00:51 -0700
commitb2197cae52338e04bb2b7911faae7bab57fcc7bc (patch)
treef886ff057f9f70ac1a04902e8ef4f883f864aeb5 /net
parenta7dee89fba4aaa5f0be152cfc7c7b9b5cff98d51 (diff)
downloadexternal_chromium-b2197cae52338e04bb2b7911faae7bab57fcc7bc.zip
external_chromium-b2197cae52338e04bb2b7911faae7bab57fcc7bc.tar.gz
external_chromium-b2197cae52338e04bb2b7911faae7bab57fcc7bc.tar.bz2
Tracking openssl-1.0.1 upgrade
Bug: 6168278 Change-Id: I5df5750bf7fa15fe98d17e072943613966127a77
Diffstat (limited to 'net')
-rw-r--r--net/socket/ssl_client_socket_openssl.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index 588098b..70ede09 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -42,9 +42,6 @@ const size_t kMaxRecvBufferSize = 4096;
const int kSessionCacheTimeoutSeconds = 60 * 60;
const size_t kSessionCacheMaxEntires = 1024;
-// This method doesn't seemed to have made it into the OpenSSL headers.
-unsigned long SSL_CIPHER_get_id(const SSL_CIPHER* cipher) { return cipher->id; }
-
// Used for encoding the |connection_status| field of an SSLInfo object.
int EncodeSSLConnectionStatus(int cipher_suite,
int compression,