oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Fix build when OpenSSL has no EGD support

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
cf/crypto.m4
View File

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

2
lib/hcrypto/rand-fortuna.c
View File

@@ -486,7 +486,7 @@ fortuna_reseed(void)
entropy_p = 1; entropy_p = 1;
} }
#endif #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 * Only to get egd entropy if /dev/random or arc4rand failed since
* it can be horribly slow to generate new bits. * it can be horribly slow to generate new bits.

2
lib/hcrypto/test_rand.c
View File

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

2
lib/krb5/crypto-rand.c
View File

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