Updated Branches:
refs/heads/master c85a874f4 -> 98b85f8a5
Revert SSL_METHOD declaration change
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/98b85f8a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/98b85f8a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/98b85f8a
Branch: refs/heads/master
Commit: 98b85f8a5827136e850075dfdc9ec86ad9b9e894
Parents: c85a874
Author: James Peach <jpeach@apache.org>
Authored: Sun Feb 19 08:54:58 2012 -0800
Committer: James Peach <jpeach@apache.org>
Committed: Sun Feb 19 08:54:58 2012 -0800
----------------------------------------------------------------------
iocore/net/SSLCertLookup.cc | 5 +++++
iocore/net/SSLNetProcessor.cc | 5 +++++
2 files changed, 10 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/98b85f8a/iocore/net/SSLCertLookup.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLCertLookup.cc b/iocore/net/SSLCertLookup.cc
index 6da48cc..acabe37 100644
--- a/iocore/net/SSLCertLookup.cc
+++ b/iocore/net/SSLCertLookup.cc
@@ -211,7 +211,12 @@ SSLCertLookup::addInfoToHash(
const char *strAddr, const char *cert,
const char *caCert, const char *serverPrivateKey) const
{
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) // openssl returns a const SSL_METHOD
const SSL_METHOD *meth = NULL;
+#else
+#else
+ SSL_METHOD *meth = NULL;
+#endif
meth = SSLv23_server_method();
SSL_CTX *ctx = SSL_CTX_new(meth);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/98b85f8a/iocore/net/SSLNetProcessor.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNetProcessor.cc b/iocore/net/SSLNetProcessor.cc
index c9f848c..f1fc51e 100644
--- a/iocore/net/SSLNetProcessor.cc
+++ b/iocore/net/SSLNetProcessor.cc
@@ -215,7 +215,12 @@ SSLNetProcessor::logSSLError(const char *errStr, int critical)
int
SSLNetProcessor::initSSL(const SslConfigParams * param)
{
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) // openssl returns a const SSL_METHOD
const SSL_METHOD *meth = NULL;
+#else
+ SSL_METHOD *meth = NULL;
+#endif
+
// Note that we do not call RAND_seed() explicitly here, we depend on OpenSSL
// to do the seeding of the PRNG for us. This is the case for all platforms that
// has /dev/urandom for example.
|