From 162bda494e7f4dfa6a1485ba5c4334fea32fc7bc Mon Sep 17 00:00:00 2001
From: Chris Oei <zlkm208-scryptgenpass@yahoo.com>
Date: Sun, 2 Sep 2012 20:19:20 -0700
Subject: [PATCH] Maximum memory and operations now both uint32

---
 lib/genpass/genpass.c | 10 +++++-----
 lib/genpass/genpass.h |  2 +-
 main.c                |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/genpass/genpass.c b/lib/genpass/genpass.c
index 196ce81..881d363 100644
--- a/lib/genpass/genpass.c
+++ b/lib/genpass/genpass.c
@@ -45,13 +45,13 @@
 
 #define ENCBLOCK 65536
 
-static int pickparams(size_t, int,
+static int pickparams(uint32_t, uint32_t,
     int *, uint32_t *, uint32_t *);
-static int checkparams(size_t, int, int, uint32_t, uint32_t);
+static int checkparams(uint32_t, uint32_t, int, uint32_t, uint32_t);
 static int getsalt(uint8_t[32]);
 
 static int
-pickparams(size_t maxmem, int megaops,
+pickparams(uint32_t maxmem, uint32_t megaops,
     int * logN, uint32_t * r, uint32_t * p)
 {
 	size_t memlimit;
@@ -110,7 +110,7 @@ pickparams(size_t maxmem, int megaops,
 }
 
 static int
-checkparams(size_t maxmem, int megaops,
+checkparams(uint32_t maxmem, uint32_t megaops,
     int logN, uint32_t r, uint32_t p)
 {
 	size_t memlimit;
@@ -186,7 +186,7 @@ err0:
 int
 genpass(uint8_t dk[64],
     const uint8_t * passwd, size_t passwdlen,
-    size_t maxmem, int megaops)
+    uint32_t maxmem, uint32_t megaops)
 {
 	uint8_t salt[32];
 	uint8_t hbuf[32];
diff --git a/lib/genpass/genpass.h b/lib/genpass/genpass.h
index 6f96eeb..3b6525a 100644
--- a/lib/genpass/genpass.h
+++ b/lib/genpass/genpass.h
@@ -74,6 +74,6 @@
 
 int genpass(uint8_t dk[64],
     const uint8_t * passwd, size_t passwdlen,
-    size_t maxmem, int megaops);
+    uint32_t maxmem, uint32_t megaops);
 
 #endif /* !_GENPASS_H_ */
diff --git a/main.c b/main.c
index 31a491f..a5ea88b 100644
--- a/main.c
+++ b/main.c
@@ -51,8 +51,8 @@ main(int argc, char *argv[])
 	FILE * infile = NULL;
 	FILE * outfile = stdout;
 	int dec = 0;
-	size_t maxmem = 1000;
-	int megaops = 5;
+	uint32_t maxmem = 1000;
+	uint32_t megaops = 5;
 	char ch;
 	char * passwd;
 	int rc;
@@ -69,7 +69,7 @@ main(int argc, char *argv[])
 	while ((ch = getopt(argc, argv, "hm:o:")) != -1) {
 		switch (ch) {
 		case 'm':
-			maxmem = strtoumax(optarg, NULL, 0);
+			maxmem = atoi(optarg);
 			break;
 		case 'o':
 			megaops = atoi(optarg);