--- sourceforge.net/trunk/rdesktop/licence.c	2002/07/29 19:21:51	73
+++ sourceforge.net/trunk/rdesktop/licence.c	2003/05/30 21:44:06	380
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    RDP licensing negotiation
-   Copyright (C) Matthew Chapman 1999-2001
+   Copyright (C) Matthew Chapman 1999-2002
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,21 +19,24 @@
 */
 
 #include "rdesktop.h"
+
+#ifdef WITH_OPENSSL
+#include <openssl/rc4.h>
+#else
 #include "crypto/rc4.h"
+#endif
 
 extern char username[16];
 extern char hostname[16];
-extern BOOL licence;
 
-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
-licence_generate_keys(uint8 * client_key, uint8 * server_key,
-		      uint8 * client_rsa)
+licence_generate_keys(uint8 * client_key, uint8 * server_key, uint8 * client_rsa)
 {
 	uint8 session_key[48];
 	uint8 temp_hash[48];
@@ -43,24 +46,23 @@
 	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
 licence_generate_hwid(uint8 * hwid)
 {
 	buf_out_uint32(hwid, 2);
-	strncpy((char *)(hwid + 4), hostname, LICENCE_HWID_SIZE - 4);
+	strncpy((char *) (hwid + 4), hostname, LICENCE_HWID_SIZE - 4);
 }
 
 /* Present an existing licence to the server */
 static void
 licence_present(uint8 * client_random, uint8 * rsa_data,
-		uint8 * licence_data, int licence_size,
-		uint8 * hwid, uint8 * signature)
+		uint8 * licence_data, int licence_size, uint8 * hwid, uint8 * signature)
 {
 	uint32 sec_flags = SEC_LICENCE_NEG;
 	uint16 length =
@@ -70,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,8 +102,7 @@
 
 /* Send a licence request packet */
 static void
-licence_send_request(uint8 * client_random, uint8 * rsa_data,
-		     char *user, char *host)
+licence_send_request(uint8 * client_random, uint8 * rsa_data, char *user, char *host)
 {
 	uint32 sec_flags = SEC_LICENCE_NEG;
 	uint16 userlen = strlen(user) + 1;
@@ -110,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);
@@ -123,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);
@@ -140,9 +143,9 @@
 licence_process_demand(STREAM s)
 {
 	uint8 null_data[SEC_MODULUS_SIZE];
-	uint8 hwid[LICENCE_HWID_SIZE];
-	uint8 signature[LICENCE_SIGNATURE_SIZE];
 	uint8 *server_random;
+	uint8 signature[LICENCE_SIGNATURE_SIZE];
+	uint8 hwid[LICENCE_HWID_SIZE];
 	uint8 *licence_data;
 	int licence_size;
 	RC4_KEY crypt_key;
@@ -156,24 +159,22 @@
 	licence_generate_keys(null_data, server_random, null_data);
 
 	licence_size = load_licence(&licence_data);
-	if (licence_size == -1)
+	if (licence_size > 0)
 	{
-		licence_send_request(null_data, null_data, username,
-				     hostname);
+		/* Generate a signature for the HWID buffer */
+		licence_generate_hwid(hwid);
+		sec_sign(signature, 16, g_licence_sign_key, 16, hwid, sizeof(hwid));
+
+		/* Now encrypt the HWID */
+		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;
 	}
 
-	/* Generate a signature for the HWID buffer */
-	licence_generate_hwid(hwid);
-	sec_sign(signature, 16, licence_sign_key, 16, hwid, sizeof(hwid));
-
-	/* Now encrypt the HWID */
-	RC4_set_key(&crypt_key, 16, licence_key);
-	RC4(&crypt_key, sizeof(hwid), hwid, hwid);
-
-	licence_present(null_data, null_data, licence_data, licence_size,
-			hwid, signature);
-	xfree(licence_data);
+	licence_send_request(null_data, null_data, username, hostname);
 }
 
 /* Send an authentication response packet */
@@ -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);
@@ -229,8 +231,7 @@
 licence_process_authreq(STREAM s)
 {
 	uint8 *in_token, *in_sig;
-	uint8 out_token[LICENCE_TOKEN_SIZE],
-		decrypt_token[LICENCE_TOKEN_SIZE];
+	uint8 out_token[LICENCE_TOKEN_SIZE], decrypt_token[LICENCE_TOKEN_SIZE];
 	uint8 hwid[LICENCE_HWID_SIZE], crypt_hwid[LICENCE_HWID_SIZE];
 	uint8 sealed_buffer[LICENCE_TOKEN_SIZE + LICENCE_HWID_SIZE];
 	uint8 out_sig[LICENCE_SIGNATURE_SIZE];
@@ -241,22 +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));
-
-	/* Deliberately break signature if licencing disabled */
-	if (!licence)
-		memset(out_sig, 0, sizeof(out_sig));
+	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);
@@ -269,31 +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;
-	save_licence(s->p, length - 2);
+	g_licence_issued = True;
+
+	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)
 	{
@@ -310,8 +321,6 @@
 			break;
 
 		case LICENCE_TAG_REISSUE:
-			break;
-
 		case LICENCE_TAG_RESULT:
 			break;