cleaning argz mess

1 files changed, 3 insertions, 90 deletions

diff --git a/src/util/crypto_ksk.c b/src/util/crypto_ksk.c
index 888c08384..1aa493ca8 100644
--- a/src/util/crypto_ksk.c
+++ b/src/util/crypto_ksk.c
@@ -684,8 +684,6 @@ ksk_decode_key (const struct KskRsaPrivateKeyBinaryEncoded *encoding)
 }
 
 
-
-
 typedef struct
 {
   GNUNET_HashCode hc;
@@ -693,6 +691,7 @@ typedef struct
 } KBlockKeyCacheLine;
 
 static KBlockKeyCacheLine **cache;
+
 static unsigned int cacheSize;
 
 /**
@@ -724,92 +723,6 @@ GNUNET_CRYPTO_rsa_key_create_from_hash (const GNUNET_HashCode * hc)
 }
 
 
-/**
- * Process ID of the "find" process that we use for
- * entropy gathering.
- */
-static pid_t genproc;
-
-/**
- * Function called by libgcrypt whenever we are
- * blocked gathering entropy.
- */
-static void
-entropy_generator (void *cls,
-                   const char *what, int printchar, int current, int total)
-{
-  unsigned long code;
-  enum GNUNET_OS_ProcessStatusType type;
-  int ret;
-
-  if (0 != strcmp (what, "need_entropy"))
-    return;
-  if (current == total)
-    {
-      if (genproc != 0)
-        {
-          if (0 != PLIBC_KILL (genproc, SIGTERM))
-            GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "kill");
-          GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (genproc));
-          genproc = 0;
-        }
-      return;
-    }
-  if (genproc != 0)
-    {
-      ret = GNUNET_OS_process_status (genproc, &type, &code);
-      if (ret == GNUNET_NO)
-        return;                 /* still running */
-      if (ret == GNUNET_SYSERR)
-        {
-          GNUNET_break (0);
-          return;
-        }
-      if (0 != PLIBC_KILL (genproc, SIGTERM))
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "kill");
-      GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (genproc));
-      genproc = 0;
-    }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              _("Starting `%s' process to generate entropy\n"), "find");
-  genproc = GNUNET_OS_start_process (NULL, NULL, "sh",
-                                     "sh",
-                                     "-c",
-                                     "exec find / -mount -type f -exec cp {} /dev/null \\; 2>/dev/null",
-                                     NULL);
-}
-
-
-static void
-killfind ()
-{
-  if (genproc != 0)
-    {
-      PLIBC_KILL (genproc, SIGKILL);
-      genproc = 0;
-    }
-}
-
-
-void __attribute__ ((constructor)) GNUNET_CRYPTO_ksk_init ()
-{
-  gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
-  if (!gcry_check_version (GCRYPT_VERSION))
-    {
-      fprintf (stderr,
-               _
-               ("libgcrypt has not the expected version (version %s is required).\n"),
-               GCRYPT_VERSION);
-      abort ();
-    }
-#ifdef gcry_fast_random_poll
-  gcry_fast_random_poll ();
-#endif
-  gcry_set_progress_handler (&entropy_generator, NULL);
-  atexit (&killfind);
-}
-
-
 void __attribute__ ((destructor)) GNUNET_CRYPTO_ksk_fini ()
 {
   int i;
@@ -820,7 +733,7 @@ void __attribute__ ((destructor)) GNUNET_CRYPTO_ksk_fini ()
       GNUNET_free (cache[i]);
     }
   GNUNET_array_grow (cache, cacheSize, 0);
-  gcry_set_progress_handler (NULL, NULL);
 }
 
-/* end of kblockkey.c */
+
+/* end of crypto_ksk.c */