kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 16:50:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 295441 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r295441 | pabelanger | 2010-11-18 13:02:12 -0500 (Thu, 18 Nov 2010) | 11 lines
  
  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/trunk@295442 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Belanger
2010-11-18 18:08:43 +00:00
parent 38926fce3c
commit 767af0dbc4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/jabber.h
View File

@@ -164,7 +164,7 @@ struct aji_client {
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
SSL_CTX *ssl_context; SSL_CTX *ssl_context;
SSL *ssl_session; SSL *ssl_session;
SSL_METHOD *ssl_method; const SSL_METHOD *ssl_method;
unsigned int stream_flags; unsigned int stream_flags;
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
enum aji_state state; enum aji_state state;

2
res/res_jabber.c
View File

@@ -1244,7 +1244,7 @@ static int aji_tls_handshake(struct aji_client *client)
/* Choose an SSL/TLS protocol version, create SSL_CTX */ /* Choose an SSL/TLS protocol version, create SSL_CTX */
client->ssl_method = SSLv3_method(); 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; return IKS_NET_TLSFAIL;
} }