From a843b21bc54bc4704e11d9c13d611e0203528146 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 16 Mar 2018 09:06:32 +0000 Subject: Tell puttygen to use /dev/urandom instead of /dev/random. On OpenBSD they are both non-blocking, but on many other -portable platforms it blocks, stalling tests. --- regress/usr.bin/ssh/test-exec.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh index 68c8057f331..e1cffbc1fbe 100644 --- a/regress/usr.bin/ssh/test-exec.sh +++ b/regress/usr.bin/ssh/test-exec.sh @@ -1,4 +1,4 @@ -# $OpenBSD: test-exec.sh,v 1.61 2017/07/28 10:32:08 dtucker Exp $ +# $OpenBSD: test-exec.sh,v 1.62 2018/03/16 09:06:31 dtucker Exp $ # Placed in the Public Domain. USER=`id -un` @@ -362,6 +362,7 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then # Add a PuTTY key to authorized_keys rm -f ${OBJ}/putty.rsa2 if ! puttygen -t rsa -o ${OBJ}/putty.rsa2 \ + --random-device=/dev/urandom \ --new-passphrase /dev/null < /dev/null > /dev/null; then echo "Your installed version of PuTTY is too old to support --new-passphrase; trying without (may require manual interaction) ..." >&2 puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null -- cgit v1.2.3