From 30181772b1fb64d089e5239f15877c5f9f188ffd Mon Sep 17 00:00:00 2001 From: pabelanger Date: Thu, 18 Nov 2010 17:51:34 +0000 Subject: Fix compiler warnings when using openssl-dev 1.0.0+ Review: https://reviewboard.asterisk.org/r/1016/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@295440 f38db490-d61c-443f-a65b-d21fe96a405b --- res/res_jabber.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'res') diff --git a/res/res_jabber.c b/res/res_jabber.c index e4bdacc78..503156089 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -618,40 +618,45 @@ static int aji_tls_handshake(struct aji_client *client) { int ret; int sock; - - ast_debug(1, "Starting TLS handshake\n"); + + ast_debug(1, "Starting TLS handshake\n"); /* Choose an SSL/TLS protocol version, create SSL_CTX */ client->ssl_method = SSLv3_method(); - client->ssl_context = SSL_CTX_new(client->ssl_method); - if (!client->ssl_context) + client->ssl_context = SSL_CTX_new((SSL_METHOD *) client->ssl_method); + if (!client->ssl_context) { return IKS_NET_TLSFAIL; + } /* Create new SSL session */ client->ssl_session = SSL_new(client->ssl_context); - if (!client->ssl_session) + if (!client->ssl_session) { return IKS_NET_TLSFAIL; + } /* Enforce TLS on our XMPP connection */ sock = iks_fd(client->p); ret = SSL_set_fd(client->ssl_session, sock); - if (!ret) + if (!ret) { return IKS_NET_TLSFAIL; + } /* Perform SSL handshake */ ret = SSL_connect(client->ssl_session); - if (!ret) + if (!ret) { return IKS_NET_TLSFAIL; + } client->stream_flags &= (~TRY_SECURE); client->stream_flags |= SECURE; /* Sent over the established TLS connection */ ret = aji_send_header(client, client->jid->server); - if (ret != IKS_OK) + if (ret != IKS_OK) { return IKS_NET_TLSFAIL; + } - ast_debug(1, "TLS started with server\n"); + ast_debug(1, "TLS started with server\n"); return IKS_OK; } -- cgit v1.2.3