From 2b485c59e532b156bbecca76848060f78f0274b9 Mon Sep 17 00:00:00 2001 From: Brian Wellington Date: Tue, 19 Sep 2000 19:08:43 +0000 Subject: [PATCH] Don't attempt to use /dev/random, even if one exists. It causes the tests to take an inordinately long time if 'randomfile' doesn't exist, when they should just fail immediately. --- bin/tests/dst/dst_test.c | 5 +---- bin/tests/dst/t_dst.c | 8 +------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/bin/tests/dst/dst_test.c b/bin/tests/dst/dst_test.c index 892f299129..b77607f2e0 100644 --- a/bin/tests/dst/dst_test.c +++ b/bin/tests/dst/dst_test.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dst_test.c,v 1.34 2000/09/12 09:58:44 bwelling Exp $ */ +/* $Id: dst_test.c,v 1.35 2000/09/19 19:08:42 bwelling Exp $ */ #include @@ -245,9 +245,6 @@ main(void) { dns_result_register(); isc_entropy_create(mctx, &ectx); -#ifdef PATH_RANDOMDEV - isc_entropy_createfilesource(ectx, PATH_RANDOMDEV); -#endif isc_entropy_createfilesource(ectx, "randomfile"); dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING|ISC_ENTROPY_GOODONLY); diff --git a/bin/tests/dst/t_dst.c b/bin/tests/dst/t_dst.c index 2bd0c468d3..f2cf13776d 100644 --- a/bin/tests/dst/t_dst.c +++ b/bin/tests/dst/t_dst.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_dst.c,v 1.40 2000/09/12 09:58:45 bwelling Exp $ */ +/* $Id: t_dst.c,v 1.41 2000/09/19 19:08:43 bwelling Exp $ */ #include @@ -371,9 +371,6 @@ t1(void) { t_result(T_UNRESOLVED); return; } -#ifdef PATH_RANDOMDEV - isc_entropy_createfilesource(ectx, PATH_RANDOMDEV); -#endif result = isc_entropy_createfilesource(ectx, "randomfile"); if (isc_result != ISC_R_SUCCESS) { t_info("isc_entropy_create failed %d\n", @@ -847,9 +844,6 @@ t2_vfy(char **av) { isc_result_totext(isc_result)); return(T_UNRESOLVED); } -#ifdef PATH_RANDOMDEV - isc_entropy_createfilesource(ectx, PATH_RANDOMDEV); -#endif result = isc_entropy_createfilesource(ectx, "randomfile"); if (isc_result != ISC_R_SUCCESS) { t_info("isc_entropy_create failed %d\n",