diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2021-12-17 09:29:21 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2021-12-17 09:29:21 +0900 |
| commit | 14f5d73e2731b83b18e9771eb3068c6dbba6f069 (patch) | |
| tree | b9d2b3dbaf139797e7afde075339a00ed34a1fc9 | |
| parent | 45974d87753978b953940045280e9f28f951dbe0 (diff) | |
| download | libgcrypt-14f5d73e2731b83b18e9771eb3068c6dbba6f069.tar.gz | |
random: Remove random-daemon use remained.
* configure.ac (--enable-random-daemon): Fix the message.
* random/random-csprng.c [USE_RANDOM_DAEMON] (initialize_basics):
Remove the dependency to random daemon.
* random/random.h [USE_RANDOM_DAEMON]: Likewise.
--
GnuPG-bug-id: 5706
Fixes-commit: 754ad5815b5bb7462260414f2bc5f449bee0b1c6
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | random/random-csprng.c | 4 | ||||
| -rw-r--r-- | random/random.h | 8 |
3 files changed, 1 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 50a52015..51a81210 100644 --- a/configure.ac +++ b/configure.ac @@ -527,7 +527,7 @@ AC_DEFINE_UNQUOTED(EGD_SOCKET_NAME, "$egd_socket_name", AC_MSG_CHECKING([whether the experimental random daemon is requested]) AC_ARG_ENABLE([random-daemon], AS_HELP_STRING([--enable-random-daemon], - [Build and support the experimental gcryptrnd]), + [Build the experimental gcryptrnd]), [use_random_daemon=$enableval], [use_random_daemon=no]) AC_MSG_RESULT($use_random_daemon) diff --git a/random/random-csprng.c b/random/random-csprng.c index aff93101..67a5242a 100644 --- a/random/random-csprng.c +++ b/random/random-csprng.c @@ -238,10 +238,6 @@ initialize_basics(void) { initialized = 1; -#ifdef USE_RANDOM_DAEMON - _gcry_daemon_initialize_basics (); -#endif /*USE_RANDOM_DAEMON*/ - /* Make sure that we are still using the values we have traditionally used for the random levels. */ gcry_assert (GCRY_WEAK_RANDOM == 0 diff --git a/random/random.h b/random/random.h index caac4b64..eedf1d0f 100644 --- a/random/random.h +++ b/random/random.h @@ -66,12 +66,4 @@ gpg_error_t _gcry_rndegd_set_socket_name (const char *name); unsigned int _gcry_rndjent_get_version (int *r_active); -/*-- random-daemon.c (only used from random.c) --*/ -#ifdef USE_RANDOM_DAEMON -void _gcry_daemon_initialize_basics (void); -int _gcry_daemon_randomize (const char *socketname, - void *buffer, size_t length, - enum gcry_random_level level); -#endif /*USE_RANDOM_DAEMON*/ - #endif /*G10_RANDOM_H*/ |