[svn-commits] pabelanger: trunk r295442 - in /trunk: ./ include/asterisk/ res/

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Thu Nov 18 12:08:43 2010
New Revision: 295442

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=295442
Log:
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/
  ........
................

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/jabber.h
    trunk/res/res_jabber.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/include/asterisk/jabber.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/jabber.h?view=diff&rev=295442&r1=295441&r2=295442
==============================================================================
--- trunk/include/asterisk/jabber.h (original)
+++ trunk/include/asterisk/jabber.h Thu Nov 18 12:08:43 2010
@@ -164,7 +164,7 @@
 #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;

Modified: trunk/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_jabber.c?view=diff&rev=295442&r1=295441&r2=295442
==============================================================================
--- trunk/res/res_jabber.c (original)
+++ trunk/res/res_jabber.c Thu Nov 18 12:08:43 2010
@@ -1244,7 +1244,7 @@
 
 	/* 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;
 	}