dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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
This commit is contained in:
pabelanger 2010-11-18 17:51:34 +00:00
parent c82f6e1129
commit 30181772b1
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/jabber.h
View File

@ -153,7 +153,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;

23
res/res_jabber.c
View File

@ -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;
}