--- sourceforge.net/trunk/rdesktop/licence.c	2002/07/14 12:06:03	61
+++ sourceforge.net/trunk/rdesktop/licence.c	2002/09/26 14:26:46	207
@@ -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
@@ -32,7 +32,7 @@
 
 /* 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];
@@ -49,21 +49,22 @@
 }
 
 static void
-licence_generate_hwid(uint8 *hwid)
+licence_generate_hwid(uint8 * hwid)
 {
 	buf_out_uint32(hwid, 2);
-	strncpy(hwid + 4, hostname, LICENCE_HWID_SIZE - 4);
+	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,
-		uint8 *licence_data, int licence_size,
-		uint8 *hwid, uint8 *signature)
+licence_present(uint8 * client_random, uint8 * rsa_data,
+		uint8 * licence_data, int licence_size, uint8 * hwid, uint8 * signature)
 {
 	uint32 sec_flags = SEC_LICENCE_NEG;
-	uint16 length = 16 + SEC_RANDOM_SIZE + SEC_MODULUS_SIZE + SEC_PADDING_SIZE
-			+ licence_size + LICENCE_HWID_SIZE + LICENCE_SIGNATURE_SIZE;
+	uint16 length =
+		16 + SEC_RANDOM_SIZE + SEC_MODULUS_SIZE + SEC_PADDING_SIZE +
+		licence_size + LICENCE_HWID_SIZE + LICENCE_SIGNATURE_SIZE;
 	STREAM s;
 
 	s = sec_init(sec_flags, length + 4);
@@ -94,11 +95,11 @@
 	s_mark_end(s);
 	sec_send(s, sec_flags);
 }
+#endif
 
 /* 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;
@@ -138,12 +139,14 @@
 licence_process_demand(STREAM s)
 {
 	uint8 null_data[SEC_MODULUS_SIZE];
-	uint8 hwid[LICENCE_HWID_SIZE];
-	uint8 signature[LICENCE_SIGNATURE_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);
@@ -153,29 +156,30 @@
 	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 != -1)
 	{
-		licence_send_request(null_data, null_data, username, hostname);
+		/* 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);
 		return;
 	}
+#endif
 
-	/* 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 */
 static void
-licence_send_authresp(uint8 *token, uint8 *crypt_hwid, uint8 *signature)
+licence_send_authresp(uint8 * token, uint8 * crypt_hwid, uint8 * signature)
 {
 	uint32 sec_flags = SEC_LICENCE_NEG;
 	uint16 length = 58;
@@ -202,7 +206,7 @@
 
 /* Parse an authentication request packet */
 static BOOL
-licence_parse_authreq(STREAM s, uint8 **token, uint8 **signature)
+licence_parse_authreq(STREAM s, uint8 ** token, uint8 ** signature)
 {
 	uint16 tokenlen;
 
@@ -226,8 +230,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];
@@ -245,8 +248,7 @@
 	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, licence_sign_key, 16, sealed_buffer, sizeof(sealed_buffer));
 
 	/* Deliberately break signature if licencing disabled */
 	if (!licence)
@@ -280,7 +282,10 @@
 		return;
 
 	licence_issued = True;
-	save_licence(s->p, length-2);
+
+#ifdef SAVE_LICENCE
+	save_licence(s->p, length - 2);
+#endif
 }
 
 /* Process a licence packet */