]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
gcrypt: switch to system rng before gcry_check_version (#24162)
authorCristian Rodríguez <crodriguez@owncloud.com>
Mon, 1 Aug 2022 05:04:27 +0000 (01:04 -0400)
committerGitHub <noreply@github.com>
Mon, 1 Aug 2022 05:04:27 +0000 (14:04 +0900)
Current docs claim this must be done before gcry_check_version.

src/basic/gcrypt-util.c

index 1927fdfe4608711aa2146cfe8a5ba86bd999abd4..41c9362be18e007d67dc450f739f8de9f17de23c 100644 (file)
@@ -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);
 }