--- sourceforge.net/trunk/rdesktop/licence.c	2002/10/06 13:57:39	214
+++ sourceforge.net/trunk/rdesktop/licence.c	2003/04/16 13:04:15	367
@@ -19,7 +19,12 @@
 */
 
 #include "rdesktop.h"
+
+#ifdef WITH_OPENSSL
+#include <openssl/rc4.h>
+#else
 #include "crypto/rc4.h"
+#endif
 
 extern char username[16];
 extern char hostname[16];
@@ -54,7 +59,6 @@
 	strncpy((char *) (hwid + 4), hostname, LICENCE_HWID_SIZE - 4);
 }
 
-#ifdef SAVE_LICENCE
 /* Present an existing licence to the server */
 static void
 licence_present(uint8 * client_random, uint8 * rsa_data,
@@ -68,7 +72,8 @@
 
 	s = sec_init(sec_flags, length + 4);
 
-	out_uint16_le(s, LICENCE_TAG_PRESENT);
+	out_uint8(s, LICENCE_TAG_PRESENT);
+	out_uint8(s, 2); /* version */
 	out_uint16_le(s, length);
 
 	out_uint32_le(s, 1);
@@ -94,7 +99,6 @@
 	s_mark_end(s);
 	sec_send(s, sec_flags);
 }
-#endif
 
 /* Send a licence request packet */
 static void
@@ -108,7 +112,8 @@
 
 	s = sec_init(sec_flags, length + 2);
 
-	out_uint16_le(s, LICENCE_TAG_REQUEST);
+	out_uint8(s, LICENCE_TAG_REQUEST);
+	out_uint8(s, 2); /* version */
 	out_uint16_le(s, length);
 
 	out_uint32_le(s, 1);
@@ -121,12 +126,12 @@
 	out_uint8p(s, rsa_data, SEC_MODULUS_SIZE);
 	out_uint8s(s, SEC_PADDING_SIZE);
 
-	out_uint16(s, LICENCE_TAG_USER);
-	out_uint16(s, userlen);
+	out_uint16_le(s, LICENCE_TAG_USER);
+	out_uint16_le(s, userlen);
 	out_uint8p(s, user, userlen);
 
-	out_uint16(s, LICENCE_TAG_HOST);
-	out_uint16(s, hostlen);
+	out_uint16_le(s, LICENCE_TAG_HOST);
+	out_uint16_le(s, hostlen);
 	out_uint8p(s, host, hostlen);
 
 	s_mark_end(s);
@@ -139,13 +144,11 @@
 {
 	uint8 null_data[SEC_MODULUS_SIZE];
 	uint8 *server_random;
-#ifdef SAVE_LICENCE
 	uint8 signature[LICENCE_SIGNATURE_SIZE];
 	uint8 hwid[LICENCE_HWID_SIZE];
 	uint8 *licence_data;
 	int licence_size;
 	RC4_KEY crypt_key;
-#endif
 
 	/* Retrieve the server random from the incoming packet */
 	in_uint8p(s, server_random, SEC_RANDOM_SIZE);
@@ -155,9 +158,8 @@
 	memset(null_data, 0, sizeof(null_data));
 	licence_generate_keys(null_data, server_random, null_data);
 
-#ifdef SAVE_LICENCE
 	licence_size = load_licence(&licence_data);
-	if (licence_size != -1)
+	if (licence_size > 0)
 	{
 		/* Generate a signature for the HWID buffer */
 		licence_generate_hwid(hwid);
@@ -171,7 +173,6 @@
 		xfree(licence_data);
 		return;
 	}
-#endif
 
 	licence_send_request(null_data, null_data, username, hostname);
 }
@@ -186,7 +187,8 @@
 
 	s = sec_init(sec_flags, length + 2);
 
-	out_uint16_le(s, LICENCE_TAG_AUTHRESP);
+	out_uint8(s, LICENCE_TAG_AUTHRESP);
+	out_uint8(s, 2); /* version */
 	out_uint16_le(s, length);
 
 	out_uint16_le(s, 1);
@@ -263,6 +265,7 @@
 	RC4_KEY crypt_key;
 	uint32 length;
 	uint16 check;
+	int i;
 
 	in_uint8s(s, 2);	/* 3d 45 - unknown */
 	in_uint16_le(s, length);
@@ -278,19 +281,30 @@
 
 	licence_issued = True;
 
-#ifdef SAVE_LICENCE
-	save_licence(s->p, length - 2);
-#endif
+	in_uint8s(s, 2);	/* pad */
+
+	/* advance to fourth string */
+	length = 0;
+	for (i = 0; i < 4; i++)
+	{
+		in_uint8s(s, length);
+		in_uint32_le(s, length);
+		if (!s_check_rem(s, length))
+			return;
+	}
+
+	licence_issued = True;
+	save_licence(s->p, length);
 }
 
 /* Process a licence packet */
 void
 licence_process(STREAM s)
 {
-	uint16 tag;
+	uint8 tag;
 
-	in_uint16_le(s, tag);
-	in_uint8s(s, 2);	/* length */
+	in_uint8(s, tag);
+	in_uint8s(s, 3);	/* version, length */
 
 	switch (tag)
 	{
@@ -307,8 +321,6 @@
 			break;
 
 		case LICENCE_TAG_REISSUE:
-			break;
-
 		case LICENCE_TAG_RESULT:
 			break;