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

Add -p option and fixed memory bug

Browse source
This commit is contained in:
Chris Oei 2012-09-02 22:53:50 -07:00
parent d8d6735872
commit a3b016ceed
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
main.c
View file

@ -41,7 +41,7 @@ usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"usage: scrypt-genpass [-m MAXMEM] [-o MAXOPS] <site>\n"); "usage: scrypt-genpass [-m MAXMEM] [-o MAXOPS] [-p PASS] <site>\n");
exit(1); exit(1);
} }
@ -54,7 +54,7 @@ main(int argc, char *argv[])
uint32_t maxmem = 1000; uint32_t maxmem = 1000;
uint32_t megaops = 32; uint32_t megaops = 32;
char ch; char ch;
char * passwd; char * passwd = NULL;
int rc; int rc;
int i; int i;
@ -66,7 +66,7 @@ main(int argc, char *argv[])
usage(); usage();
/* Parse arguments. */ /* Parse arguments. */
while ((ch = getopt(argc, argv, "hm:o:")) != -1) { while ((ch = getopt(argc, argv, "hm:o:p:")) != -1) {
switch (ch) { switch (ch) {
case 'm': case 'm':
maxmem = atoi(optarg); maxmem = atoi(optarg);
@ -74,6 +74,9 @@ main(int argc, char *argv[])
case 'o': case 'o':
megaops = atoi(optarg); megaops = atoi(optarg);
break; break;
case 'p':
passwd = strdup(optarg);
break;
default: default:
usage(); usage();
} }
@ -85,10 +88,12 @@ main(int argc, char *argv[])
if (argc != 1) if (argc != 1)
usage(); usage();
/* Prompt for a password. */ if (!passwd) {
if (tarsnap_readpass(&passwd, "Please enter passphrase", /* Prompt for a password. */
dec ? NULL : "Please confirm passphrase", 1)) if (tarsnap_readpass(&passwd, "Please enter passphrase",
exit(1); dec ? NULL : "Please confirm passphrase", 1))
exit(1);
}
uint8_t dk[64]; uint8_t dk[64];
rc = genpass(dk, (uint8_t *)passwd, strlen(passwd), (void*) *argv, rc = genpass(dk, (uint8_t *)passwd, strlen(passwd), (void*) *argv,
@ -98,7 +103,7 @@ main(int argc, char *argv[])
memset(passwd, 0, strlen(passwd)); memset(passwd, 0, strlen(passwd));
free(passwd); free(passwd);
char* buf = malloc(65); char buf[65];
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
sprintf(buf + i, "%x", dk[i]); sprintf(buf + i, "%x", dk[i]);
} }