Fix build when OpenSSL has no EGD support

This commit is contained in:
Bernard
2015-04-10 22:47:03 +02:00
parent 0de18bdb5f
commit 828f4f4fb1
4 changed files with 4 additions and 3 deletions

View File

@@ -118,6 +118,7 @@ if test "$crypto_lib" = "unknown" -a "$with_openssl" != "no"; then
break;
fi
done
AC_CHECK_LIB(crypto, RAND_egd, AC_DEFINE(HAVE_RAND_EGD, 1, [Define if the libcrypto has RAND_egd]))
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
fi

View File

@@ -486,7 +486,7 @@ fortuna_reseed(void)
entropy_p = 1;
}
#endif
#ifndef NO_RAND_EGD_METHOD
#if !defined(NO_RAND_EGD_METHOD) && defined(HAVE_RAND_EGD)
/*
* Only to get egd entropy if /dev/random or arc4rand failed since
* it can be horribly slow to generate new bits.

View File

@@ -125,7 +125,7 @@ main(int argc, char **argv)
else if (strcasecmp(rand_method, "unix") == 0)
RAND_set_rand_method(RAND_unix_method());
#endif
#ifndef NO_RAND_EGD_METHOD
#if !defined(NO_RAND_EGD_METHOD) && defined(HAVE_RAND_EGD)
else if (strcasecmp(rand_method, "egd") == 0)
RAND_set_rand_method(RAND_egd_method());
#endif

View File

@@ -67,7 +67,7 @@ seed_something(void)
/* Calling RAND_status() will try to use /dev/urandom if it exists so
we do not have to deal with it. */
if (RAND_status() != 1) {
#ifndef NO_RAND_EGD_METHOD
#if !defined(NO_RAND_EGD_METHOD) && defined(HAVE_RAND_EGD)
krb5_context context;
const char *p;