Refactor EGD conditional support

As per Jeremy's request in #124
Windows does not define HAVE_RAND_EGD resulting in the same conditional
support for EGD.
This commit is contained in:
Bernard Spil
2015-04-21 10:04:08 +02:00
parent 828f4f4fb1
commit 858480145b
6 changed files with 3 additions and 10 deletions
+1 -1
View File
@@ -486,7 +486,7 @@ fortuna_reseed(void)
entropy_p = 1;
}
#endif
#if !defined(NO_RAND_EGD_METHOD) && defined(HAVE_RAND_EGD)
#if 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.
+1 -1
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
#if !defined(NO_RAND_EGD_METHOD) && defined(HAVE_RAND_EGD)
#if defined(HAVE_RAND_EGD)
else if (strcasecmp(rand_method, "egd") == 0)
RAND_set_rand_method(RAND_egd_method());
#endif
+1 -1
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) {
#if !defined(NO_RAND_EGD_METHOD) && defined(HAVE_RAND_EGD)
#if defined(HAVE_RAND_EGD)
krb5_context context;
const char *p;