}
-/* Used to register a progress callback. This needs to be called
- before any threads are created. */
-void
-_gcry_register_random_progress (void (*cb)(void *,const char*,int,int,int),
- void *cb_data );
-
+/**
+ * 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)
+entropy_generator (void *cls,
+ const char *what, int printchar, int current, int total)
{
- static pid_t genproc;
+ unsigned long code;
+ enum GNUNET_OS_ProcessStatusType type;
+ int ret;
+
if (0 != strcmp (what, "need_entropy"))
return;
if (current == total)
{
if (genproc != 0)
- {
- PLIBC_KILL(genproc, SIGKILL);
- GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (genproc));
- 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;
}
- genproc = GNUNET_OS_start_process ("find",
- "find",
- "-type",
- "s",
- "-fprint",
- "/dev/null",
- NULL);
-
+ 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;
+ }
}
#ifdef gcry_fast_random_poll
gcry_fast_random_poll ();
#endif
- _gcry_register_random_progress (&entropy_generator, NULL);
+ gcry_set_progress_handler (&entropy_generator, NULL);
+ atexit (&killfind);
}
+
void __attribute__ ((destructor)) GNUNET_CRYPTO_ksk_fini ()
{
int i;
GNUNET_free (cache[i]);
}
GNUNET_array_grow (cache, cacheSize, 0);
- _gcry_register_random_progress (NULL, NULL);
+ gcry_set_progress_handler (NULL, NULL);
}
/* end of kblockkey.c */