js/scrypt-genpass
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed error handling for unreadable keyfiles

Browse source
This commit is contained in:
Chris Oei 2012-09-03 12:29:55 -07:00
parent 30c7739e93
commit 0e63a1f69d
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
main.c
View file

@ -128,15 +128,20 @@ main(int argc, char *argv[])
memset(passwd, 0, passwdlen); memset(passwd, 0, passwdlen);
free(passwd); free(passwd);
size_t n = fread(combinedkey + passwdlen, keyfilelen, 1, fp); size_t n = fread(combinedkey + passwdlen, keyfilelen, 1, fp);
/* TODO: check n == number of items read == 1 */
fclose(fp); fclose(fp);
if (n != 1) {
warn("Unable to read keyfile");
exit(1);
}
passwd = combinedkey; passwd = combinedkey;
passwdlen += keyfilelen; passwdlen += keyfilelen;
} else { } else {
rc = 15; warn("Unable to allocate memory for combined key");
exit(1);
} }
} else { } else {
rc = 14; warn("Unable to open keyfile %s", keyfile);
exit(1);
} }
} }