summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorBernd Edlinger <bernd.edlinger@hotmail.de>2020-05-17 02:08:56 +0200
committerBernd Edlinger <bernd.edlinger@hotmail.de>2020-05-20 14:48:16 +0200
commitddec332f329a432a45c0131d83f3bfb46114532b (patch)
treec9aab70fd8bc1895c6116b856cbd3afd57bf8ac1 /Configure
parenta7ad40c502d3484e0a574e121cfba70631f224bf (diff)
downloadopenssl-new-ddec332f329a432a45c0131d83f3bfb46114532b.tar.gz
Fix egd and devrandom source configs
./config --with-rand-seed=egd need to defines OPENSSL_RAND_SEED_EGD and OPENSSL_NO_EGD so get rid of OPENSSL_NO_EGD (compiles but I did not really test EGD) ./config --with-rand-seed=devrandom does not work since wait_random_seeded works under the assumption that OPENSSL_RAND_SEED_GETRANDOM is supposed to be enabled as well, that is usually the case, but not when only devrandom is enabled. Skip the wait code in this special case. Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/11848)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure3
1 files changed, 3 insertions, 0 deletions
diff --git a/Configure b/Configure
index 7738073455..1a22f47822 100755
--- a/Configure
+++ b/Configure
@@ -1124,6 +1124,9 @@ if (scalar(@seed_sources) == 0) {
print "Using os-specific seed configuration\n";
push @seed_sources, 'os';
}
+if (scalar(grep { $_ eq 'egd' } @seed_sources) > 0) {
+ delete $disabled{'egd'};
+}
if (scalar(grep { $_ eq 'none' } @seed_sources) > 0) {
die "Cannot seed with none and anything else" if scalar(@seed_sources) > 1;
warn <<_____ if scalar(@seed_sources) == 1;