--- rdesktop-1.5.0/rdp.c.ark	2008-01-08 14:56:40.000000000 +0000
+++ rdesktop-1.5.0/rdp.c	2008-01-08 14:56:55.000000000 +0000
@@ -436,7 +436,7 @@
 		out_uint32_le(s, 0xffffffc4);
 		out_uint32_le(s, 0xfffffffe);
 		out_uint32_le(s, g_rdp5_performanceflags);
-		out_uint32(s, 0);
+		out_uint16(s, 0);
 
 
 	}
--- rdesktop-1.5.0/secure.c.ark	2008-01-08 14:55:32.000000000 +0000
+++ rdesktop-1.5.0/secure.c	2008-01-08 14:56:34.000000000 +0000
@@ -534,7 +534,8 @@
 
 	   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)
+	if (OBJ_obj2nid(cert->cert_info->key->algor->algorithm) == NID_md5WithRSAEncryption ||
+	    OBJ_obj2nid(cert->cert_info->key->algor->algorithm) == NID_shaWithRSAEncryption)
 	{
 		DEBUG_RDP5(("Re-setting algorithm type to RSA in server certificate\n"));
 		ASN1_OBJECT_free(cert->cert_info->key->algor->algorithm);