CVS: rdesktop ssl.c,1.3,1.4

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

Modified Files:
	ssl.c 
Log Message:
Fix for Windows 2008 Server (see Patch #1744033)


Index: ssl.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/ssl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ssl.c	10 Feb 2007 07:08:23 -0000	1.3
--- ssl.c	5 Apr 2008 07:37:02 -0000	1.4
***************
*** 141,144 ****
--- 141,146 ----
  	EVP_PKEY *epk = NULL;
  	SSL_RKEY *lkey;
+ 	int nid;
+ 
  	/* By some reason, Microsoft sets the OID of the Public RSA key to
  	   the oid for "MD5 with RSA Encryption" instead of "RSA Encryption"
***************
*** 146,150 ****
  	   Kudos to Richard Levitte for the following (. intiutive .) 
  	   lines of code that resets the OID and let's us extract the key. */
! 	if (OBJ_obj2nid(cert->cert_info->key->algor->algorithm) == NID_md5WithRSAEncryption)
  	{
  		DEBUG_RDP5(("Re-setting algorithm type to RSA in server certificate\n"));
--- 148,153 ----
  	   Kudos to Richard Levitte for the following (. intiutive .) 
  	   lines of code that resets the OID and let's us extract the key. */
! 	nid = OBJ_obj2nid(cert->cert_info->key->algor->algorithm);
! 	if ((nid == NID_md5WithRSAEncryption) || (nid == NID_shaWithRSAEncryption))
  	{
  		DEBUG_RDP5(("Re-setting algorithm type to RSA in server certificate\n"));


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Register now and save $200. Hurry, offer ends at 11:59 p.m., 
Monday, April 7! Use priority code J8TLD2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone