CVS: rdesktop secure.c,1.60,1.61

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8967

Modified Files:
	secure.c 
Log Message:
warnings on newer openssl-versions


Index: secure.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/secure.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** secure.c	1 Nov 2006 21:45:49 -0000	1.60
--- secure.c	1 Nov 2006 22:12:27 -0000	1.61
***************
*** 27,30 ****
--- 27,36 ----
  #include <openssl/x509v3.h>
  
+ #if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090800f)
+ #define D2I_X509_CONST const
+ #else
+ #define D2I_X509_CONST
+ #endif
+ 
  extern char g_hostname[16];
  extern int g_width;
***************
*** 651,655 ****
  			in_uint32_le(s, ignorelen);
  			DEBUG_RDP5(("Ignored Certificate length is %d\n", ignorelen));
! 			ignorecert = d2i_X509(NULL, &(s->p), ignorelen);
  
  			if (ignorecert == NULL)
--- 657,663 ----
  			in_uint32_le(s, ignorelen);
  			DEBUG_RDP5(("Ignored Certificate length is %d\n", ignorelen));
! 			ignorecert =
! 				d2i_X509(NULL, (D2I_X509_CONST unsigned char **) &(s->p),
! 					 ignorelen);
  
  			if (ignorecert == NULL)
***************
*** 675,679 ****
  		in_uint32_le(s, cacert_len);
  		DEBUG_RDP5(("CA Certificate length is %d\n", cacert_len));
! 		cacert = d2i_X509(NULL, &(s->p), cacert_len);
  		/* Note: We don't need to move s->p here - d2i_X509 is
  		   "kind" enough to do it for us */
--- 683,687 ----
  		in_uint32_le(s, cacert_len);
  		DEBUG_RDP5(("CA Certificate length is %d\n", cacert_len));
! 		cacert = d2i_X509(NULL, (D2I_X509_CONST unsigned char **) &(s->p), cacert_len);
  		/* Note: We don't need to move s->p here - d2i_X509 is
  		   "kind" enough to do it for us */
***************
*** 698,702 ****
  		in_uint32_le(s, cert_len);
  		DEBUG_RDP5(("Certificate length is %d\n", cert_len));
! 		server_cert = d2i_X509(NULL, &(s->p), cert_len);
  		if (NULL == server_cert)
  		{
--- 706,710 ----
  		in_uint32_le(s, cert_len);
  		DEBUG_RDP5(("Certificate length is %d\n", cert_len));
! 		server_cert = d2i_X509(NULL, (D2I_X509_CONST unsigned char **) &(s->p), cert_len);
  		if (NULL == server_cert)
  		{


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642