From: jsondevers <jsondevers@gmail.com>
Date: Thu, 28 Nov 2024 16:49:23 +0000 (-0500)
Subject: Add handling for additional input in jitter rng
X-Git-Tag: openssl-3.5.0-alpha1~856
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d41cc910306868285b89bd4b95d79bac693a630;p=thirdparty%2Fopenssl.git

Add handling for additional input in jitter rng

Fixes #25917

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Hugo Landau <hlandau@devever.net>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25966)
---

diff --git a/providers/implementations/rands/seed_src_jitter.c b/providers/implementations/rands/seed_src_jitter.c
index 1a1919d8230..f6f0ed54a18 100644
--- a/providers/implementations/rands/seed_src_jitter.c
+++ b/providers/implementations/rands/seed_src_jitter.c
@@ -194,6 +194,14 @@ static int jitter_generate(void *vseed, unsigned char *out, size_t outlen,
         return 0;
     }
 
+    if (adin != NULL && adin_len > 0) {
+        if (!ossl_rand_pool_add(pool, adin, adin_len, 0)) {
+            ERR_raise(ERR_LIB_PROV, ERR_R_RAND_LIB);
+            ossl_rand_pool_free(pool);
+            return 0;
+        }
+    }
+
     /* Get entropy from jitter entropy library. */
     entropy_available = ossl_prov_acquire_entropy_from_jitter(s, pool);