summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar samisa2011-08-30 13:56:22 +0000
committerGravatar samisa2011-08-30 13:56:22 +0000
commit3be0c8228528c7aadb053c9626344113fe7460f5 (patch)
tree8c224c76fa82ff753157b4a0a3eac5f54a0916d7
parent2c0d16cf0efd65ac60d03d597fe6cf327fefc501 (diff)
downloadaxis2c-3be0c8228528c7aadb053c9626344113fe7460f5.tar.gz
axis2c-3be0c8228528c7aadb053c9626344113fe7460f5.tar.bz2
applied patch given in AXIS2C-1521 to fix SSL build error
git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@1163211 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/core/transport/http/sender/ssl/ssl_utils.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/transport/http/sender/ssl/ssl_utils.c b/src/core/transport/http/sender/ssl/ssl_utils.c
index 66cb9e7..603eac5 100644
--- a/src/core/transport/http/sender/ssl/ssl_utils.c
+++ b/src/core/transport/http/sender/ssl/ssl_utils.c
@@ -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