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

Re-define mega as 1024 * 1024 instead of 1000 * 1000

Browse source
This commit is contained in:
Chris Oei 2012-09-02 20:40:05 -07:00
parent f40668e4ef
commit 218ea0dc9d
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/genpass/genpass.c
View file

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