Make Fortuna the default PRNG algorithm

ticket: 6874

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24653 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/configure.in b/src/configure.in
index 3ec2b06b3984955595c5f80080fd90512c92aa02..1220f96c699b758d56a644577cdca3d2febd5603 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -154,28 +154,18 @@ AC_SUBST(CRYPTO_IMPL_LIBS)
 if test "$CRYPTO_IMPL" = nss; then
        PRNG_ALG="nss"
 else
-PRNG_ALG="yarrow"
 AC_ARG_WITH([prng-alg],
-AC_HELP_STRING([--with-prng-alg=ALG], [use specified PRNG algorithm. Ignored for nss. @<:@yarrow@:>@]),
+AC_HELP_STRING([--with-prng-alg=ALG], [use specified PRNG algorithm. Ignored for nss. @<:@fortuna@:>@]),
 [PRNG_ALG=$withval
 AC_MSG_RESULT("k5crypto will use \'$withval\'")
-], withval=yarrow)
+], PRNG_ALG=fortuna)
 fi
 AC_CONFIG_COMMANDS(PRNG_ALG, , PRNG_ALG=$PRNG_ALG)
 AC_SUBST(PRNG_ALG)
-if test "$withval" = fortuna; then
+if test "$PRNG_ALG" = fortuna; then
        AC_DEFINE(FORTUNA,1,[Define if Fortuna PRNG is selected])
 fi
 
-AC_ARG_ENABLE([fortuna-test],
-       [  --enable-fortuna-test  build to test Fortuna PRNG],,enableval=no)
-if test "$enableval" = yes ; then
-       PRNG_FORTUNA_TEST="yes"
-       AC_DEFINE(TEST_FORTUNA,1,[Create a special build to test Fortuna PRNG])
-       AC_CONFIG_COMMANDS(PRNG_FORTUNA_TEST, , PRNG_FORTUNA_TEST=$PRNG_FORTUNA_TEST)
-       AC_SUBST(PRNG_FORTUNA_TEST)
-fi
-
 # --with-kdc-kdb-update makes the KDC update the database with last request
 # information and failure information.