From e2e5abe47af60260e9a4247597e64a4e9d266a7a Mon Sep 17 00:00:00 2001 From: Pauli Date: Wed, 31 Jul 2019 19:31:45 +1000 Subject: [PATCH 1/1] Prevent an infinite recursion when the query cache is flushed. The problem being that the "requires flush" flag was being cleared after the the flush. The fix is to clear it before. This is a problem because the cache flushing called RAND_bytes and if the DRBG hadn't been created yet, it would be queried and added to the cache causing the flush code to repeat. Reviewed-by: Bernd Edlinger (Merged from https://github.com/openssl/openssl/pull/9477) --- crypto/property/property.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/property/property.c b/crypto/property/property.c index a92968c902..cab2ab243e 100644 --- a/crypto/property/property.c +++ b/crypto/property/property.c @@ -429,8 +429,8 @@ static void ossl_method_cache_flush_some(OSSL_METHOD_STORE *store) state.nelem = 0; if ((state.seed = OPENSSL_rdtsc()) == 0) state.seed = 1; - ossl_sa_ALGORITHM_doall_arg(store->algs, &impl_cache_flush_one_alg, &state); store->need_flush = 0; + ossl_sa_ALGORITHM_doall_arg(store->algs, &impl_cache_flush_one_alg, &state); store->nelem = state.nelem; } -- 2.34.1