From 13ce86259ebe6bba2096f0135337a93dba625ecb Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Sat, 20 Oct 2018 16:53:57 +0200 Subject: [PATCH] RAND_load_file(): return error if reseeding failed The failure of RAND_load_file was only noticed because of the heap corruption which was reported in #7499 and fixed in commit 5b4cb385c18a. To prevent this in the future, RAND_load_file() now explicitly checks RAND_status() and reports an error if it fails. Related-to: #7449 Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/7456) --- crypto/rand/randfile.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c index 89720eb5cf..028c1281c0 100644 --- a/crypto/rand/randfile.c +++ b/crypto/rand/randfile.c @@ -148,6 +148,12 @@ int RAND_load_file(const char *file, long bytes) OPENSSL_cleanse(buf, sizeof(buf)); fclose(in); + if (!RAND_status()) { + RANDerr(RAND_F_RAND_LOAD_FILE, RAND_R_RESEED_ERROR); + ERR_add_error_data(2, "Filename=", file); + return -1; + } + return ret; } -- 2.25.1