From f284b66dda266b0315f0562d5098c728a4863f35 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 18 Nov 2010 18:02:12 +0000 Subject: [PATCH] Merged revisions 295440 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r295440 | pabelanger | 2010-11-18 12:51:34 -0500 (Thu, 18 Nov 2010) | 4 lines Fix compiler warnings when using openssl-dev 1.0.0+ Review: https://reviewboard.asterisk.org/r/1016/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@295441 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/jabber.h | 2 +- res/res_jabber.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/asterisk/jabber.h b/include/asterisk/jabber.h index 3965f7a0fb..85d459cf45 100644 --- a/include/asterisk/jabber.h +++ b/include/asterisk/jabber.h @@ -164,7 +164,7 @@ struct aji_client { #ifdef HAVE_OPENSSL SSL_CTX *ssl_context; SSL *ssl_session; - SSL_METHOD *ssl_method; + const SSL_METHOD *ssl_method; unsigned int stream_flags; #endif /* HAVE_OPENSSL */ enum aji_state state; diff --git a/res/res_jabber.c b/res/res_jabber.c index 0c463f0c64..4b1e156cf9 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -1244,7 +1244,7 @@ static int aji_tls_handshake(struct aji_client *client) /* Choose an SSL/TLS protocol version, create SSL_CTX */ client->ssl_method = SSLv3_method(); - if (!(client->ssl_context = SSL_CTX_new(client->ssl_method))) { + if (!(client->ssl_context = SSL_CTX_new((SSL_METHOD *) client->ssl_method))) { return IKS_NET_TLSFAIL; }