--- sourceforge.net/trunk/rdesktop/secure.c	2002/09/26 14:26:46	207
+++ sourceforge.net/trunk/rdesktop/secure.c	2003/02/04 05:32:13	309
@@ -38,6 +38,7 @@
 extern int keylayout;
 extern BOOL encryption;
 extern BOOL licence_issued;
+extern int server_bpp;
 
 static int rc4_key_len;
 static RC4_KEY rc4_decrypt_key;
@@ -285,7 +286,7 @@
 static void
 sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint8 * modulus, uint8 * exponent)
 {
-	BN_CTX ctx;
+	BN_CTX *ctx;
 	BIGNUM mod, exp, x, y;
 	uint8 inr[SEC_MODULUS_SIZE];
 	int outlen;
@@ -295,7 +296,7 @@
 	memcpy(inr, in, len);
 	reverse(inr, len);
 
-	BN_CTX_init(&ctx);
+	ctx = BN_CTX_new();
 	BN_init(&mod);
 	BN_init(&exp);
 	BN_init(&x);
@@ -304,7 +305,7 @@
 	BN_bin2bn(modulus, SEC_MODULUS_SIZE, &mod);
 	BN_bin2bn(exponent, SEC_EXPONENT_SIZE, &exp);
 	BN_bin2bn(inr, len, &x);
-	BN_mod_exp(&y, &x, &exp, &mod, &ctx);
+	BN_mod_exp(&y, &x, &exp, &mod, ctx);
 	outlen = BN_bn2bin(&y, out);
 	reverse(out, outlen);
 	if (outlen < SEC_MODULUS_SIZE)
@@ -314,7 +315,7 @@
 	BN_clear_free(&x);
 	BN_free(&exp);
 	BN_free(&mod);
-	BN_CTX_free(&ctx);
+	BN_CTX_free(ctx);
 }
 
 /* Initialise secure transport packet */
@@ -425,7 +426,14 @@
 	out_uint32_le(s, 12);
 	out_uint8s(s, 64);	/* reserved? 4 + 12 doublewords */
 
-	out_uint16_le(s, 0xca01);
+	if (server_bpp == 16)
+	{
+		out_uint16_le(s, 0xca03); /* 16 bit */
+	}
+	else
+	{
+		out_uint16_le(s, 0xca01); /* 8 bit */
+	}
 	out_uint16(s, 0);
 
 	/* Client encryption settings */
@@ -631,6 +639,7 @@
 	sec_process_mcs_data(&mcs_data);
 	if (encryption)
 		sec_establish_key();
+	xfree(mcs_data.data);
 	return True;
 }