From: Cristian Rodríguez <crodriguez@owncloud.com>
Date: Mon, 1 Aug 2022 05:04:27 +0000 (-0400)
Subject: gcrypt: switch to system rng before gcry_check_version (#24162)
X-Git-Tag: v252-rc1~554
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91375fb9cf38aca397a6d50e3f22dfb7a4aa1b98;p=thirdparty%2Fsystemd.git

gcrypt: switch to system rng before gcry_check_version (#24162)

Current docs claim this must be done before gcry_check_version.
---

diff --git a/src/basic/gcrypt-util.c b/src/basic/gcrypt-util.c
index 1927fdfe460..41c9362be18 100644
--- a/src/basic/gcrypt-util.c
+++ b/src/basic/gcrypt-util.c
@@ -9,6 +9,7 @@ void initialize_libgcrypt(bool secmem) {
         if (gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P))
                 return;
 
+        gcry_control(GCRYCTL_SET_PREFERRED_RNG_TYPE, GCRY_RNG_TYPE_SYSTEM);
         assert_se(gcry_check_version("1.4.5"));
 
         /* Turn off "secmem". Clients which wish to make use of this
@@ -16,7 +17,6 @@ void initialize_libgcrypt(bool secmem) {
         if (!secmem)
                 gcry_control(GCRYCTL_DISABLE_SECMEM);
 
-        gcry_control(GCRYCTL_SET_PREFERRED_RNG_TYPE, GCRY_RNG_TYPE_SYSTEM);
         gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
 }