diff options
| author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-09-13 00:47:28 +0200 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-09-14 06:36:22 +0200 |
| commit | 4f14a378f807e989aa0b328267732409c8d6ac68 (patch) | |
| tree | b0a269b10d6c2ed8ce702411f5b9db9a293b2e15 /providers | |
| parent | 1d30b0a4ada5707e10ee9a94ca4acd2e45004d01 (diff) | |
prov/drbg: cleanup some RAND_DRBG leftovers
These are leftovers from the RAND_DRBG removal (#12509).
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12866)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/fips/self_test_kats.c | 4 | ||||
| -rw-r--r-- | providers/implementations/rands/drbg.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/providers/fips/self_test_kats.c b/providers/fips/self_test_kats.c index 8c88f8be5d..44d7557530 100644 --- a/providers/fips/self_test_kats.c +++ b/providers/fips/self_test_kats.c @@ -315,7 +315,7 @@ static int self_test_drbg(const ST_KAT_DRBG *t, OSSL_SELF_TEST *st, if (!EVP_RAND_set_ctx_params(test, drbg_params)) goto err; - /* This calls RAND_DRBG_reseed() internally when prediction_resistance = 1 */ + /* This calls PROV_DRBG_reseed() internally when prediction_resistance = 1 */ if (!EVP_RAND_generate(drbg, out, t->expectedlen, strength, prediction_resistance, t->entropyaddin2, t->entropyaddin2len)) @@ -329,7 +329,7 @@ static int self_test_drbg(const ST_KAT_DRBG *t, OSSL_SELF_TEST *st, if (!EVP_RAND_uninstantiate(drbg)) goto err; /* - * Check that the DRBG data has been zeroized after RAND_DRBG_uninstantiate. + * Check that the DRBG data has been zeroized after PROV_DRBG_uninstantiate. */ if (!EVP_RAND_verify_zeroization(drbg)) goto err; diff --git a/providers/implementations/rands/drbg.c b/providers/implementations/rands/drbg.c index 08f3472561..5a41647b33 100644 --- a/providers/implementations/rands/drbg.c +++ b/providers/implementations/rands/drbg.c @@ -133,10 +133,10 @@ static unsigned int get_parent_reseed_count(PROV_DRBG *drbg) } /* - * Implements the get_entropy() callback (see RAND_DRBG_set_callbacks()) + * Implements the get_entropy() callback * * If the DRBG has a parent, then the required amount of entropy input - * is fetched using the parent's RAND_DRBG_generate(). + * is fetched using the parent's PROV_DRBG_generate(). * * Otherwise, the entropy is polled from the system entropy sources * using prov_pool_acquire_entropy(). @@ -229,7 +229,7 @@ err: } /* - * Implements the cleanup_entropy() callback (see RAND_DRBG_set_callbacks()) + * Implements the cleanup_entropy() callback * */ static void prov_drbg_cleanup_entropy(PROV_DRBG *drbg, |