From 218ea0dc9d3e90e3ede44e16a4761e5b3181bd4d Mon Sep 17 00:00:00 2001
From: Chris Oei <zlkm208-scryptgenpass@yahoo.com>
Date: Sun, 2 Sep 2012 20:40:05 -0700
Subject: [PATCH] Re-define mega as 1024 * 1024 instead of 1000 * 1000

---
 lib/genpass/genpass.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/genpass/genpass.c b/lib/genpass/genpass.c
index ef623c7..4202bdc 100644
--- a/lib/genpass/genpass.c
+++ b/lib/genpass/genpass.c
@@ -44,6 +44,7 @@
 #include "genpass.h"
 
 #define ENCBLOCK 65536
+#define MEGA (1024*1024)
 
 static int pickparams(uint32_t, uint32_t,
     int *, uint32_t *, uint32_t *);
@@ -61,9 +62,8 @@ pickparams(uint32_t maxmem, uint32_t megaops,
 	int rc;
 
 	/* Figure out how much memory to use. */
-	memlimit = maxmem * 1000000;
-
-	opslimit = 1000000 * megaops;
+	memlimit = MEGA * maxmem;
+	opslimit = MEGA * megaops;
 
 	/* Fix r = 8 for now. */
 	*r = 8;