diff options
| author | Benjamin Kaduk <bkaduk@akamai.com> | 2016-01-12 18:02:16 -0600 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-01-14 13:02:51 -0500 |
| commit | 0423f812dc61f70c6ae6643191259ca9e5692c7f (patch) | |
| tree | 505fd5ca6269bf07f48d4375664ebb2af61aab7e /apps | |
| parent | 47153c72536a53ecd8f428444b953db0631acc9b (diff) | |
Add a no-egd option to disable EGD-related code
The entropy-gathering daemon is used only on a small number of machines.
Provide a configure knob so that EGD support can be disabled by default
but re-enabled on those systems that do need it.
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_rand.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/app_rand.c b/apps/app_rand.c index 4ee8475422..a6805d4d75 100644 --- a/apps/app_rand.c +++ b/apps/app_rand.c @@ -126,6 +126,7 @@ int app_RAND_load_file(const char *file, int dont_warn) if (file == NULL) file = RAND_file_name(buffer, sizeof buffer); +#ifndef OPENSSL_NO_EGD else if (RAND_egd(file) > 0) { /* * we try if the given filename is an EGD socket. if it is, we don't @@ -134,6 +135,7 @@ int app_RAND_load_file(const char *file, int dont_warn) egdsocket = 1; return 1; } +#endif if (file == NULL || !RAND_load_file(file, -1)) { if (RAND_status() == 0) { if (!dont_warn) { @@ -161,7 +163,9 @@ long app_RAND_load_files(char *name) char *p, *n; int last; long tot = 0; +#ifndef OPENSSL_NO_EGD int egd; +#endif for (;;) { last = 0; @@ -174,10 +178,12 @@ long app_RAND_load_files(char *name) if (*n == '\0') break; +#ifndef OPENSSL_NO_EGD egd = RAND_egd(n); if (egd > 0) tot += egd; else +#endif tot += RAND_load_file(n, -1); if (last) break; |