From: Nikos Mavrogiannopoulos <nmav@crystal.(none)>
Date: Thu, 4 Dec 2008 18:46:57 +0000 (+0200)
Subject: gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0) is being called after
X-Git-Tag: gnutls_2_7_3~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e917c6264e33854c0dbd326cfac4869817fc0f85;p=thirdparty%2Fgnutls.git

gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0) is being called after
libgcrypt initialization (gnutls_global_init).
---

diff --git a/src/certtool.c b/src/certtool.c
index 0388b2bbd6..65f244ec35 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -915,9 +915,6 @@ gaa_parser (int argc, char **argv)
       template_parse (info.template);
     }
 
-  if (info.quick_random != 0)
-    gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
-
 #ifdef gcry_fips_mode_active
   if (gcry_fips_mode_active ())
     {
@@ -938,6 +935,9 @@ gaa_parser (int argc, char **argv)
   if ((ret = gnutls_global_init_extra ()) < 0)
     error (EXIT_FAILURE, 0, "global_init_extra: %s", gnutls_strerror (ret));
 
+  if (info.quick_random != 0)
+    gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
+
   switch (info.action)
     {
     case ACTION_SELF_SIGNED: