wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename the rand_drbg_st data member "pool" to "seed_pool"

Browse source 
... to make the intended use more clear and differentiate
it from the data member "adin_pool".

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7575)

(cherry picked from commit 31f32abb8e)
This commit is contained in:
Bernd Edlinger 2018-11-05 23:13:11 +01:00
parent 9bc987f008
commit 294941aebb
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crypto/rand/drbg_lib.c
View file

@ -487,11 +487,11 @@ int rand_drbg_restart(RAND_DRBG *drbg,
const unsigned char *adin = NULL; const unsigned char *adin = NULL;
size_t adinlen = 0; size_t adinlen = 0;
if (drbg->pool != NULL) { if (drbg->seed_pool != NULL) {
RANDerr(RAND_F_RAND_DRBG_RESTART, ERR_R_INTERNAL_ERROR); RANDerr(RAND_F_RAND_DRBG_RESTART, ERR_R_INTERNAL_ERROR);
drbg->state = DRBG_ERROR; drbg->state = DRBG_ERROR;
rand_pool_free(drbg->pool); rand_pool_free(drbg->seed_pool);
drbg->pool = NULL; drbg->seed_pool = NULL;
return 0; return 0;
} }
@ -511,8 +511,8 @@ int rand_drbg_restart(RAND_DRBG *drbg,
} }
/* will be picked up by the rand_drbg_get_entropy() callback */ /* will be picked up by the rand_drbg_get_entropy() callback */
drbg->pool = rand_pool_attach(buffer, len, entropy); drbg->seed_pool = rand_pool_attach(buffer, len, entropy);
if (drbg->pool == NULL) if (drbg->seed_pool == NULL)
return 0; return 0;
} else { } else {
if (drbg->max_adinlen < len) { if (drbg->max_adinlen < len) {
@ -558,8 +558,8 @@ int rand_drbg_restart(RAND_DRBG *drbg,
} }
} }
rand_pool_free(drbg->pool); rand_pool_free(drbg->seed_pool);
drbg->pool = NULL; drbg->seed_pool = NULL;
return drbg->state == DRBG_READY; return drbg->state == DRBG_READY;
} }

2
crypto/rand/rand_lcl.h
View file

@ -183,7 +183,7 @@ struct rand_drbg_st {
* with respect to how randomness is added to the RNG during reseeding * with respect to how randomness is added to the RNG during reseeding
* (see PR #4328). * (see PR #4328).
*/ */
struct rand_pool_st *pool; struct rand_pool_st *seed_pool;
/* /*
* Auxiliary pool for additional data. * Auxiliary pool for additional data.

8
crypto/rand/rand_lib.c
View file

@ -146,8 +146,8 @@ size_t rand_drbg_get_entropy(RAND_DRBG *drbg,
return 0; return 0;
} }
if (drbg->pool != NULL) { if (drbg->seed_pool != NULL) {
pool = drbg->pool; pool = drbg->seed_pool;
pool->entropy_requested = entropy; pool->entropy_requested = entropy;
} else { } else {
pool = rand_pool_new(entropy, min_len, max_len); pool = rand_pool_new(entropy, min_len, max_len);
@ -204,7 +204,7 @@ size_t rand_drbg_get_entropy(RAND_DRBG *drbg,
} }
err: err:
if (drbg->pool == NULL) if (drbg->seed_pool == NULL)
rand_pool_free(pool); rand_pool_free(pool);
return ret; return ret;
} }
@ -216,7 +216,7 @@ size_t rand_drbg_get_entropy(RAND_DRBG *drbg,
void rand_drbg_cleanup_entropy(RAND_DRBG *drbg, void rand_drbg_cleanup_entropy(RAND_DRBG *drbg,
unsigned char *out, size_t outlen) unsigned char *out, size_t outlen)
{ {
if (drbg->pool == NULL) if (drbg->seed_pool == NULL)
OPENSSL_secure_clear_free(out, outlen); OPENSSL_secure_clear_free(out, outlen);
} }