LBRYFoundation/pool
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/pool.git synced 2025-08-27 23:41:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

stratum: fix client memory leak in yescrypt

Browse source
This commit is contained in:
Tanguy Pruvot 2018-05-14 17:35:09 +02:00
parent 495dcbba00
commit a3103af7ba
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
stratum/algos/yescrypt.c
View file

@ -327,14 +327,10 @@ static int yescrypt_bsty(const uint8_t * passwd, size_t passwdlen,
const uint8_t * salt, size_t saltlen, uint64_t N, uint32_t r, uint32_t p, const uint8_t * salt, size_t saltlen, uint64_t N, uint32_t r, uint32_t p,
uint8_t * buf, size_t buflen) uint8_t * buf, size_t buflen)
{ {
static __thread int initialized = 0; yescrypt_shared_t shared;
static __thread yescrypt_shared_t shared; yescrypt_local_t local;
static __thread yescrypt_local_t local;
int retval; int retval;
if (!initialized) {
/* "shared" could in fact be shared, but it's simpler to keep it private
* along with "local". It's dummy and tiny anyway. */
if (yescrypt_init_shared(&shared, NULL, 0, if (yescrypt_init_shared(&shared, NULL, 0,
0, 0, 0, YESCRYPT_SHARED_DEFAULTS, 0, NULL, 0)) 0, 0, 0, YESCRYPT_SHARED_DEFAULTS, 0, NULL, 0))
return -1; return -1;
@ -342,20 +338,14 @@ static int yescrypt_bsty(const uint8_t * passwd, size_t passwdlen,
yescrypt_free_shared(&shared); yescrypt_free_shared(&shared);
return -1; return -1;
} }
initialized = 1;
}
retval = yescrypt_kdf(&shared, &local, retval = yescrypt_kdf(&shared, &local,
passwd, passwdlen, salt, saltlen, N, r, p, 0, YESCRYPT_FLAGS, passwd, passwdlen, salt, saltlen, N, r, p, 0, YESCRYPT_FLAGS,
buf, buflen); buf, buflen);
#if 0
if (yescrypt_free_local(&local)) { yescrypt_free_local(&local);
yescrypt_free_shared(&shared); yescrypt_free_shared(&shared);
return -1;
}
if (yescrypt_free_shared(&shared))
return -1;
initialized = 0;
#endif
return retval; return retval;
} }
@ -364,6 +354,7 @@ void yescrypt_hash(const char *input, char *output, uint32_t len)
{ {
yescrypt_bsty((uint8_t*)input, len, (uint8_t*)input, len, 2048, 8, 1, (uint8_t*)output, 32); yescrypt_bsty((uint8_t*)input, len, (uint8_t*)input, len, 2048, 8, 1, (uint8_t*)output, 32);
} }
void yescryptR16_hash(const char *input, char *output, uint32_t len) void yescryptR16_hash(const char *input, char *output, uint32_t len)
{ {
yescrypt_bsty((uint8_t*)input, len, (uint8_t*)input, len, 4096, 16, 1, (uint8_t*)output, 32); yescrypt_bsty((uint8_t*)input, len, (uint8_t*)input, len, 4096, 16, 1, (uint8_t*)output, 32);