From: Jan Janssen <medhefgo@web.de>
Date: Mon, 29 Nov 2021 14:42:26 +0000 (+0100)
Subject: sd-boot: Fix assert failure in random-seed.c
X-Git-Tag: v250-rc1~120
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0289441e09df60ee76c84cba049afaa2d816383e;p=thirdparty%2Fsystemd.git

sd-boot: Fix assert failure in random-seed.c

Fixes: #21556
---

diff --git a/src/boot/efi/random-seed.c b/src/boot/efi/random-seed.c
index e829cf98b1d..1da9ebc8229 100644
--- a/src/boot/efi/random-seed.c
+++ b/src/boot/efi/random-seed.c
@@ -66,8 +66,7 @@ static void hash_once(
         struct sha256_ctx hash;
 
         assert(old_seed);
-        assert(rng);
-        assert(system_token);
+        assert(system_token_size == 0 || system_token);
 
         sha256_init_ctx(&hash);
         sha256_process_bytes(old_seed, size, &hash);
@@ -92,8 +91,7 @@ static EFI_STATUS hash_many(
         _cleanup_freepool_ void *output = NULL;
 
         assert(old_seed);
-        assert(rng);
-        assert(system_token);
+        assert(system_token_size == 0 || system_token);
         assert(ret);
 
         /* Hashes the specified parameters in counter mode, generating n hash values, with the counter in the
@@ -127,8 +125,7 @@ static EFI_STATUS mangle_random_seed(
         UINTN n;
 
         assert(old_seed);
-        assert(rng);
-        assert(system_token);
+        assert(system_token_size == 0 || system_token);
         assert(ret_new_seed);
         assert(ret_for_kernel);