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

Make types more robust

Browse source
This commit is contained in:
Chris Oei 2012-09-03 11:50:02 -07:00
parent 466c5a69e5
commit 205ca9df63
3 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/genpass/genpass.c
View file

@ -49,7 +49,7 @@
static int pickparams(uint32_t, uint32_t,
int *, uint32_t *, uint32_t *);
static int checkparams(uint32_t, uint32_t, int, uint32_t, uint32_t);
static int getsalt(uint8_t[32], void* site);
static int getsalt(uint8_t[32], char* site);
static int
pickparams(uint32_t maxmem, uint32_t megaops,
@ -161,9 +161,9 @@ sha256string(uint8_t hash[32], uint8_t* s, int n)
}
static int
getsalt(uint8_t salt[32], void* site)
getsalt(uint8_t salt[32], char* site)
{
sha256string(salt, site, strlen(site));
sha256string(salt, (uint8_t*) site, strlen(site));
char buf[65];
bintohex(buf, 32, salt);
printf("Site hex: %s\n", buf);
@ -172,7 +172,7 @@ getsalt(uint8_t salt[32], void* site)
int
genpass(uint8_t dk[64],
const uint8_t * passwd, size_t passwdlen, void* site,
const uint8_t * passwd, size_t passwdlen, char* site,
uint32_t maxmem, uint32_t megaops)
{
uint8_t salt[32];

2
lib/genpass/genpass.h
View file

@ -76,7 +76,7 @@ int bintohex(char* outstring, size_t nbytes, uint8_t* data);
int sha256string(uint8_t* hash, uint8_t* s, int n);
int genpass(uint8_t dk[64],
const uint8_t * passwd, size_t passwdlen, void* site,
const uint8_t * passwd, size_t passwdlen, char* site,
uint32_t maxmem, uint32_t megaops);
#endif /* !_GENPASS_H_ */