Merged revisions 295441 via svnmerge from

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

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;

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