diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 15:06:56 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 15:06:56 +0000 |
| commit | 853ed268053a520c251fc03937d6eafe3f5d360c (patch) | |
| tree | a4102bf86eb9b95a886ac889dac0bb19f928aa13 /net/tools | |
| parent | 5fc6e67abec594943b321e373858441d3c60972c (diff) | |
| download | chromium_src-853ed268053a520c251fc03937d6eafe3f5d360c.zip chromium_src-853ed268053a520c251fc03937d6eafe3f5d360c.tar.gz chromium_src-853ed268053a520c251fc03937d6eafe3f5d360c.tar.bz2 | |
Temporary preventative build fix
Openssl 1.0.0 is const correct for SSL_METHOD - adding a temporary
const cast so we can land the new versin without a build break.
(Once that is in, we can switch the SSLState member to be const instead)
BUG=None
TEST=try servers remain green
Review URL: http://codereview.chromium.org/9129019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rw-r--r-- | net/tools/flip_server/spdy_ssl.cc | 6 | ||||
| -rw-r--r-- | net/tools/flip_server/spdy_ssl.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/net/tools/flip_server/spdy_ssl.cc b/net/tools/flip_server/spdy_ssl.cc index 8d3b21c..292bbe0 100644 --- a/net/tools/flip_server/spdy_ssl.cc +++ b/net/tools/flip_server/spdy_ssl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -36,7 +36,9 @@ void InitSSL(SSLState* state, PrintSslError(); state->ssl_method = SSLv23_method(); - state->ssl_ctx = SSL_CTX_new(state->ssl_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)); if (!state->ssl_ctx) { PrintSslError(); LOG(FATAL) << "Unable to create SSL context"; diff --git a/net/tools/flip_server/spdy_ssl.h b/net/tools/flip_server/spdy_ssl.h index eac6ad2..8db0d8c 100644 --- a/net/tools/flip_server/spdy_ssl.h +++ b/net/tools/flip_server/spdy_ssl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,7 +12,7 @@ namespace net { struct SSLState { - SSL_METHOD* ssl_method; + const SSL_METHOD* ssl_method; SSL_CTX* ssl_ctx; }; |