summaryrefslogtreecommitdiffstats
path: root/net/tools/flip_server
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-25 17:56:00 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-25 17:56:00 +0000
commitd8bbb28f1dfaaa6d46a8536e8bcb20fb91bc99ee (patch)
tree6f0b77f2cc5051c52abb8620700d149d002fa8bb /net/tools/flip_server
parentd76c7d133e41540f00331a48f6d72f18af4cb719 (diff)
downloadchromium_src-d8bbb28f1dfaaa6d46a8536e8bcb20fb91bc99ee.zip
chromium_src-d8bbb28f1dfaaa6d46a8536e8bcb20fb91bc99ee.tar.gz
chromium_src-d8bbb28f1dfaaa6d46a8536e8bcb20fb91bc99ee.tar.bz2
flip_server: Remove const_cast from SSL_CTX_new() call.
The const_cast is not more necessary because our version of openssl was already updated to the version which SSL_CTX_new takes a const parameter. BUG=None TEST=builds R=rsleevi@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/176903002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/flip_server')
-rw-r--r--net/tools/flip_server/spdy_ssl.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/tools/flip_server/spdy_ssl.cc b/net/tools/flip_server/spdy_ssl.cc
index 1f18a0b..2a5cb0e 100644
--- a/net/tools/flip_server/spdy_ssl.cc
+++ b/net/tools/flip_server/spdy_ssl.cc
@@ -42,9 +42,7 @@ void InitSSL(SSLState* state,
PrintSslError();
state->ssl_method = SSLv23_method();
- // TODO(joth): Remove const_cast when the openssl 1.0.0 upgrade is complete.
- // (See http://codereview.chromium.org/9254031).
- state->ssl_ctx = SSL_CTX_new(const_cast<SSL_METHOD*>(state->ssl_method));
+ state->ssl_ctx = SSL_CTX_new(state->ssl_method);
if (!state->ssl_ctx) {
PrintSslError();
LOG(FATAL) << "Unable to create SSL context";