--- sourceforge.net/trunk/rdesktop/licence.c	2003/01/21 20:22:44	293
+++ sourceforge.net/trunk/rdesktop/licence.c	2003/06/06 10:44:20	408
@@ -29,10 +29,10 @@
 extern char username[16];
 extern char hostname[16];
 
-static uint8 licence_key[16];
-static uint8 licence_sign_key[16];
+static uint8 g_licence_key[16];
+static uint8 g_licence_sign_key[16];
 
-BOOL licence_issued = False;
+BOOL g_licence_issued = False;
 
 /* Generate a session key and RC4 keys, given client and server randoms */
 static void
@@ -46,10 +46,10 @@
 	sec_hash_48(session_key, temp_hash, server_key, client_key, 65);
 
 	/* Store first 16 bytes of session key, for generating signatures */
-	memcpy(licence_sign_key, session_key, 16);
+	memcpy(g_licence_sign_key, session_key, 16);
 
 	/* Generate RC4 key */
-	sec_hash_16(licence_key, &session_key[16], client_key, server_key);
+	sec_hash_16(g_licence_key, &session_key[16], client_key, server_key);
 }
 
 static void
@@ -59,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,
@@ -73,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);
@@ -99,7 +99,6 @@
 	s_mark_end(s);
 	sec_send(s, sec_flags);
 }
-#endif
 
 /* Send a licence request packet */
 static void
@@ -113,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);
@@ -126,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);
@@ -144,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);
@@ -160,23 +158,21 @@
 	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);
-		sec_sign(signature, 16, licence_sign_key, 16, hwid, sizeof(hwid));
+		sec_sign(signature, 16, g_licence_sign_key, 16, hwid, sizeof(hwid));
 
 		/* Now encrypt the HWID */
-		RC4_set_key(&crypt_key, 16, licence_key);
+		RC4_set_key(&crypt_key, 16, g_licence_key);
 		RC4(&crypt_key, sizeof(hwid), hwid, hwid);
 
 		licence_present(null_data, null_data, licence_data, licence_size, hwid, signature);
 		xfree(licence_data);
 		return;
 	}
-#endif
 
 	licence_send_request(null_data, null_data, username, hostname);
 }
@@ -191,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);
@@ -245,17 +242,17 @@
 	memcpy(out_token, in_token, LICENCE_TOKEN_SIZE);
 
 	/* Decrypt the token. It should read TEST in Unicode. */
-	RC4_set_key(&crypt_key, 16, licence_key);
+	RC4_set_key(&crypt_key, 16, g_licence_key);
 	RC4(&crypt_key, LICENCE_TOKEN_SIZE, in_token, decrypt_token);
 
 	/* Generate a signature for a buffer of token and HWID */
 	licence_generate_hwid(hwid);
 	memcpy(sealed_buffer, decrypt_token, LICENCE_TOKEN_SIZE);
 	memcpy(sealed_buffer + LICENCE_TOKEN_SIZE, hwid, LICENCE_HWID_SIZE);
-	sec_sign(out_sig, 16, licence_sign_key, 16, sealed_buffer, sizeof(sealed_buffer));
+	sec_sign(out_sig, 16, g_licence_sign_key, 16, sealed_buffer, sizeof(sealed_buffer));
 
 	/* Now encrypt the HWID */
-	RC4_set_key(&crypt_key, 16, licence_key);
+	RC4_set_key(&crypt_key, 16, g_licence_key);
 	RC4(&crypt_key, LICENCE_HWID_SIZE, hwid, crypt_hwid);
 
 	licence_send_authresp(out_token, crypt_hwid, out_sig);
@@ -268,34 +265,46 @@
 	RC4_KEY crypt_key;
 	uint32 length;
 	uint16 check;
+	int i;
 
 	in_uint8s(s, 2);	/* 3d 45 - unknown */
 	in_uint16_le(s, length);
 	if (!s_check_rem(s, length))
 		return;
 
-	RC4_set_key(&crypt_key, 16, licence_key);
+	RC4_set_key(&crypt_key, 16, g_licence_key);
 	RC4(&crypt_key, length, s->p, s->p);
 
 	in_uint16(s, check);
 	if (check != 0)
 		return;
 
-	licence_issued = True;
+	g_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;
+	}
+
+	g_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)
 	{
@@ -312,8 +321,6 @@
 			break;
 
 		case LICENCE_TAG_REISSUE:
-			break;
-
 		case LICENCE_TAG_RESULT:
 			break;