[Rdesktop-commits] SF.net SVN: rdesktop:[1660] rdesktop/trunk/rdesktop.c

[<he...@us...>]

Revision: 1660
          http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1660&view=rev
Author:   hean01
Date:     2012-06-19 06:01:10 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Fixes a bug were license filename differs from load/save license that
was introduced with commit 1648 and made rdesktop to always request
a license and never present the one stored.

Also fixed a potential issue with hash string length that did not
have room for an \0 after the hash stringify conversion.

Modified Paths:
--------------
    rdesktop/trunk/rdesktop.c

Modified: rdesktop/trunk/rdesktop.c
===================================================================
--- rdesktop/trunk/rdesktop.c	2012-06-15 05:16:20 UTC (rev 1659)
+++ rdesktop/trunk/rdesktop.c	2012-06-19 06:01:10 UTC (rev 1660)
@@ -1567,7 +1567,7 @@
 load_licence(unsigned char **data)
 {
 	uint8 ho[20], hi[16];
-	char *home, path[PATH_MAX], hash[40];
+	char *home, path[PATH_MAX], hash[41];
 	struct stat st;
 	int fd, length;
 
@@ -1577,7 +1577,7 @@
 
 	snprintf((char *) hi, 16, g_hostname);
 	sec_hash_sha1_16(ho, hi, g_static_rdesktop_salt_16);
-	sec_hash_to_string(hash, 40, ho, 22);
+	sec_hash_to_string(hash, 41, ho, 20);
 
 	snprintf(path, PATH_MAX, "%s" RDESKTOP_LICENSE_STORE "/%s.cal", home, hash);
 	path[sizeof(path) - 1] = '\0';
@@ -1608,7 +1608,7 @@
 save_licence(unsigned char *data, int length)
 {
 	uint8 ho[20], hi[16];
-	char *home, path[PATH_MAX], tmppath[PATH_MAX], hash[40];
+	char *home, path[PATH_MAX], tmppath[PATH_MAX], hash[41];
 	int fd;
 
 	home = getenv("HOME");
@@ -1625,7 +1625,7 @@
 
 	snprintf((char *) hi, 16, g_hostname);
 	sec_hash_sha1_16(ho, hi, g_static_rdesktop_salt_16);
-	sec_hash_to_string(hash, 40, ho, 20);
+	sec_hash_to_string(hash, 41, ho, 20);
 
 	/* write licence to {sha1}.cal.new, then atomically 
 	   rename to {sha1}.cal */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.