From 6f8884cc8513438e4a3c35f932cd2f0479657a46 Mon Sep 17 00:00:00 2001 From: Bernard Spil Date: Thu, 7 Apr 2016 21:43:22 +0200 Subject: [PATCH] Fix build when OpenSSL does not have EGD support - EGD is disabled by default in OpenSSL 1.1.0 - EGD was removed in LibreSSL - No modern platform requires EGD --- lib/hcrypto/rand-egd.c | 4 ++++ lib/krb5/crypto-rand.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/lib/hcrypto/rand-egd.c b/lib/hcrypto/rand-egd.c index dd2d3e1..ceb8c47 100644 --- a/lib/hcrypto/rand-egd.c +++ b/lib/hcrypto/rand-egd.c @@ -33,6 +33,8 @@ #include +#ifndef OPENSSL_NO_EGD + #include #ifdef HAVE_SYS_UN_H #include @@ -258,3 +260,5 @@ RAND_egd_bytes(const char *filename, int size) return 1; } + +#endif diff --git a/lib/krb5/crypto-rand.c b/lib/krb5/crypto-rand.c index 49bd679..d6118c1 100644 --- a/lib/krb5/crypto-rand.c +++ b/lib/krb5/crypto-rand.c @@ -66,6 +66,7 @@ seed_something(void) krb5_context context; const char *p; +#ifndef OPENSSL_NO_EGD /* Try using egd */ if (!krb5_init_context(&context)) { p = krb5_config_get_string(context, NULL, "libdefaults", @@ -74,6 +75,8 @@ seed_something(void) RAND_egd_bytes(p, ENTROPY_NEEDED); krb5_free_context(context); } +#endif + #else /* TODO: Once a Windows CryptoAPI RAND method is defined, we can use that and failover to another method. */