From a3b016ceed45cbf95ad1c9a73ea74de553b33866 Mon Sep 17 00:00:00 2001 From: Chris Oei Date: Sun, 2 Sep 2012 22:53:50 -0700 Subject: [PATCH] Add -p option and fixed memory bug --- main.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/main.c b/main.c index f9660a8..5a14246 100644 --- a/main.c +++ b/main.c @@ -41,7 +41,7 @@ usage(void) { fprintf(stderr, - "usage: scrypt-genpass [-m MAXMEM] [-o MAXOPS] \n"); + "usage: scrypt-genpass [-m MAXMEM] [-o MAXOPS] [-p PASS] \n"); exit(1); } @@ -54,7 +54,7 @@ main(int argc, char *argv[]) uint32_t maxmem = 1000; uint32_t megaops = 32; char ch; - char * passwd; + char * passwd = NULL; int rc; int i; @@ -66,7 +66,7 @@ main(int argc, char *argv[]) usage(); /* Parse arguments. */ - while ((ch = getopt(argc, argv, "hm:o:")) != -1) { + while ((ch = getopt(argc, argv, "hm:o:p:")) != -1) { switch (ch) { case 'm': maxmem = atoi(optarg); @@ -74,6 +74,9 @@ main(int argc, char *argv[]) case 'o': megaops = atoi(optarg); break; + case 'p': + passwd = strdup(optarg); + break; default: usage(); } @@ -85,10 +88,12 @@ main(int argc, char *argv[]) if (argc != 1) usage(); - /* Prompt for a password. */ - if (tarsnap_readpass(&passwd, "Please enter passphrase", - dec ? NULL : "Please confirm passphrase", 1)) - exit(1); + if (!passwd) { + /* Prompt for a password. */ + if (tarsnap_readpass(&passwd, "Please enter passphrase", + dec ? NULL : "Please confirm passphrase", 1)) + exit(1); + } uint8_t dk[64]; rc = genpass(dk, (uint8_t *)passwd, strlen(passwd), (void*) *argv, @@ -98,7 +103,7 @@ main(int argc, char *argv[]) memset(passwd, 0, strlen(passwd)); free(passwd); - char* buf = malloc(65); + char buf[65]; for (i = 0; i < 64; i++) { sprintf(buf + i, "%x", dk[i]); }