axis-c-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r1163211 - /axis/axis2/c/core/trunk/src/core/transport/http/sender/ssl/ssl_utils.c
Date Tue, 30 Aug 2011 13:56:23 GMT
Author: samisa
Date: Tue Aug 30 13:56:22 2011
New Revision: 1163211

URL: http://svn.apache.org/viewvc?rev=1163211&view=rev
Log:
applied patch given in AXIS2C-1521 to fix SSL build error

Modified:
    axis/axis2/c/core/trunk/src/core/transport/http/sender/ssl/ssl_utils.c

Modified: axis/axis2/c/core/trunk/src/core/transport/http/sender/ssl/ssl_utils.c
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/http/sender/ssl/ssl_utils.c?rev=1163211&r1=1163210&r2=1163211&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/transport/http/sender/ssl/ssl_utils.c (original)
+++ axis/axis2/c/core/trunk/src/core/transport/http/sender/ssl/ssl_utils.c Tue Aug 30 13:56:22
2011
@@ -40,7 +40,6 @@ axis2_ssl_utils_initialize_ctx(
     axis2_char_t * key_file,
     axis2_char_t * ssl_pp)
 {
-    SSL_METHOD *meth = NULL;
     SSL_CTX *ctx = NULL;
     axis2_char_t *ca_file = server_cert;
 
@@ -63,7 +62,11 @@ axis2_ssl_utils_initialize_ctx(
     }
 
     /* Create our context */
-    meth = (SSL_METHOD*)SSLv23_method();
+ # if defined OPENSSL_VERSION_NUMBER && (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
+    const SSL_METHOD *meth = SSLv23_method();
+ # else
+    SSL_METHOD *meth = SSLv23_method();
+ # endif
     ctx = SSL_CTX_new(meth);
 
     /* Load our keys and certificates



Mime
View raw message