kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes a bug were license filename differs from load/save license that

Browse Source 
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.

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/rdesktop/trunk@1660 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Henrik Andersson 2012-06-19 06:01:10 +00:00
parent c44025aa18
commit eed9bc7210
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rdesktop.c
View File

@ -1567,7 +1567,7 @@ int
load_licence(unsigned char **data) load_licence(unsigned char **data)
{ {
uint8 ho[20], hi[16]; uint8 ho[20], hi[16];
char *home, path[PATH_MAX], hash[40]; char *home, path[PATH_MAX], hash[41];
struct stat st; struct stat st;
int fd, length; int fd, length;
@ -1577,7 +1577,7 @@ load_licence(unsigned char **data)
snprintf((char *) hi, 16, g_hostname); snprintf((char *) hi, 16, g_hostname);
sec_hash_sha1_16(ho, hi, g_static_rdesktop_salt_16); 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); snprintf(path, PATH_MAX, "%s" RDESKTOP_LICENSE_STORE "/%s.cal", home, hash);
path[sizeof(path) - 1] = '\0'; path[sizeof(path) - 1] = '\0';
@ -1608,7 +1608,7 @@ void
save_licence(unsigned char *data, int length) save_licence(unsigned char *data, int length)
{ {
uint8 ho[20], hi[16]; 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; int fd;
home = getenv("HOME"); home = getenv("HOME");
@ -1625,7 +1625,7 @@ save_licence(unsigned char *data, int length)
snprintf((char *) hi, 16, g_hostname); snprintf((char *) hi, 16, g_hostname);
sec_hash_sha1_16(ho, hi, g_static_rdesktop_salt_16); 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 /* write licence to {sha1}.cal.new, then atomically
rename to {sha1}.cal */ rename to {sha1}.cal */