svn commit: r886344 - in /incubator/trafficserver/traffic/trunk/iocore/net: SSLCertLookup.cc SSLNet.cc

[bc...@apache.org]

Author: bcall
Date: Thu Dec  3 00:09:22 2009
New Revision: 886344

URL: http://svn.apache.org/viewvc?rev=886344&view=rev
Log:
TS-59 added #if's to check the version of openssl.  If the version is
greater then or equal to "1.0.0" then it will declare SSL_METHOD to be
const

Modified:
    incubator/trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc
    incubator/trafficserver/traffic/trunk/iocore/net/SSLNet.cc

Modified: incubator/trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc?rev=886344&r1=886343&r2=886344&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc Thu Dec  3 00:09:22 2009
@@ -197,7 +197,12 @@
 SSLCertLookup::addInfoToHash(char *strAddr, char *cert, char *serverPrivateKey)
 {
 
-  SSL_METHOD *meth = SSLv23_server_method();
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) // openssl returns a const SSL_METHOD now
+  const SSL_METHOD *meth = NULL;
+#else
+  SSL_METHOD *meth = NULL;
+#endif
+  meth = SSLv23_server_method();
   SSL_CTX *ctx = SSL_CTX_new(meth);
   if (!ctx) {
     ssl_NetProcessor.logSSLError("Cannot create new server contex.");

Modified: incubator/trafficserver/traffic/trunk/iocore/net/SSLNet.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/SSLNet.cc?rev=886344&r1=886343&r2=886344&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/SSLNet.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/SSLNet.cc Thu Dec  3 00:09:22 2009
@@ -224,7 +224,11 @@
 int
 SSLNetProcessor::initSSL(SslConfigParams * param)
 {
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) // openssl returns a const SSL_METHOD now
+  const SSL_METHOD *meth = NULL;
+#else
   SSL_METHOD *meth = NULL;
+#endif
   char *serverKeyPtr = NULL;
 
   int randBuff[64];
@@ -500,7 +504,11 @@
 int
 SSLNetProcessor::initSSLClient(SslConfigParams * param)
 {
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) // openssl returns a const SSL_METHOD now
+  const SSL_METHOD *meth = NULL;
+#else
   SSL_METHOD *meth = NULL;
+#endif
   int client_verify_server;
   char *clientKeyPtr = NULL;