diff options
| author | Werner Koch <wk@gnupg.org> | 2007-04-30 15:37:37 +0000 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2007-04-30 15:37:37 +0000 |
| commit | 4a8c058c6b8e1cacc178cf0d63de1e6218c852aa (patch) | |
| tree | fe0c002c283545280bec0014b99051a0db9292dd /src | |
| parent | 9222b6f51074fa33a962db3ef25414f01e23677e (diff) | |
| download | libgcrypt-4a8c058c6b8e1cacc178cf0d63de1e6218c852aa.tar.gz | |
Add support for setting the EGD socket.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/gcrypt.h.in | 3 | ||||
| -rw-r--r-- | src/global.c | 26 |
3 files changed, 29 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cc384aba..65bfe958 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,8 +1,9 @@ 2007-04-30 Werner Koch <wk@g10code.com> - * global.c (gcry_control): New. - * gcrypt.h.in (GCRYCTL_DUMP_CONFIG): New. + (GCRYCTL_SET_RNDEGD_SOCKET): New. + * global.c (gcry_control): Add GCRYCTL_DUMP_CONFIG and + GCRYCTL_SET_RNDEGD_SOCKET. 2007-04-18 Werner Koch <wk@g10code.com> diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in index 3ddb1788..537462d7 100644 --- a/src/gcrypt.h.in +++ b/src/gcrypt.h.in @@ -356,7 +356,8 @@ enum gcry_ctl_cmds GCRYCTL_SET_RANDOM_DAEMON_SOCKET = 49, GCRYCTL_USE_RANDOM_DAEMON = 50, GCRYCTL_FAKED_RANDOM_P = 51, - GCRYCTL_DUMP_CONFIG = 52 + GCRYCTL_DUMP_CONFIG = 52, + GCRYCTL_SET_RNDEGD_SOCKET = 53 }; /* Perform various operations defined by CMD. */ diff --git a/src/global.c b/src/global.c index cbec9668..8350c09c 100644 --- a/src/global.c +++ b/src/global.c @@ -343,6 +343,14 @@ gcry_control (enum gcry_ctl_cmds cmd, ...) _gcry_fast_random_poll (); break; + case GCRYCTL_SET_RNDEGD_SOCKET: +#if USE_RNDEGD + err = _gcry_rndegd_set_socket_name (va_arg (arg_ptr, const char *)); +#else + err = gpg_error (GPG_ERR_NOT_SUPPORTED); +#endif + break; + case GCRYCTL_SET_RANDOM_DAEMON_SOCKET: _gcry_set_random_daemon_socket (va_arg (arg_ptr, const char *)); break; @@ -359,8 +367,22 @@ gcry_control (enum gcry_ctl_cmds cmd, ...) used before the intialization has been finished but not before a gcry_version_check. */ case GCRYCTL_DUMP_CONFIG: - log_info ("version=%s\n", VERSION); - log_info ("mpi-asm=%s\n", _gcry_mpi_get_hw_config ()); + log_info ("version:%s:\n", VERSION); + log_info ("mpi-asm:%s:\n", _gcry_mpi_get_hw_config ()); + log_info ("rnd-mod:" +#if USE_RNDEGD + "egd:" +#endif +#if USE_RNDLINUX + "linux:" +#endif +#if USE_RNDUNIX + "unix:" +#endif +#if USE_RNDW32 + "w32:" +#endif + "\n"); break; default: |