diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2021-12-07 10:10:25 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2021-12-07 10:10:25 +0900 |
| commit | 754ad5815b5bb7462260414f2bc5f449bee0b1c6 (patch) | |
| tree | ea656c8308269015e31b98de1ae7a8c57f36b344 /src | |
| parent | 751fcadd34ed42b2e595664e9ec3f88fd074d7b7 (diff) | |
| download | libgcrypt-754ad5815b5bb7462260414f2bc5f449bee0b1c6.tar.gz | |
random: Remove use of experimental random daemon.
* random/Makefile.am (librandom_la_SOURCES): Remove random-daemon.c.
* random/random-daemon.c: Remove.
* random/rand-internal.h: Remove declarations.
* random/random-csprng.c (_gcry_rngcsprng_set_daemon_socket)
(_gcry_rngcsprng_use_daemon): Remove.
[USE_RANDOM_DAEMON] (_gcry_rngcsprng_randomize): Don't call
_gcry_daemon_randomize.
* random/random.c (_gcry_set_random_daemon_socket)
(_gcry_use_random_daemon): Remove.
* src/global.c (_gcry_vcontrol): Return GPG_ERR_NOT_SUPPORTED.
* tests/benchmark.c (main): Remove support of use_random_daemon.
--
GnuPG-bug-id: 5706
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/global.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/global.c b/src/global.c index 1ff736d7..58873372 100644 --- a/src/global.c +++ b/src/global.c @@ -664,16 +664,11 @@ _gcry_vcontrol (enum gcry_ctl_cmds cmd, va_list arg_ptr) break; case GCRYCTL_SET_RANDOM_DAEMON_SOCKET: - _gcry_set_preferred_rng_type (0); - _gcry_set_random_daemon_socket (va_arg (arg_ptr, const char *)); + rc = GPG_ERR_NOT_SUPPORTED; break; case GCRYCTL_USE_RANDOM_DAEMON: - /* We need to do make sure that the random pool is really - initialized so that the poll function is not a NOP. */ - _gcry_set_preferred_rng_type (0); - _gcry_random_initialize (1); - _gcry_use_random_daemon (!! va_arg (arg_ptr, int)); + rc = GPG_ERR_NOT_SUPPORTED; break; case GCRYCTL_CLOSE_RANDOM_DEVICE: |