diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2018-03-16 09:06:31 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-03-23 11:05:39 +1100 |
commit | dc31e79454e9b9140b33ad380565fdb59b9c4f33 (patch) | |
tree | fbda08d7fba4a6db9e49f361affff93d8dc15f09 /regress/test-exec.sh | |
parent | cb1f94431ef319cd48618b8b771b58739a8210cf (diff) |
upstream: 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.
OpenBSD-Regress-ID: 397d0d4c719c353f24d79f5b14775e0cfdf0e1cc
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r-- | regress/test-exec.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 68f010b70..46558b057 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.61 2017/07/28 10:32:08 dtucker Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.62 2018/03/16 09:06:31 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -503,6 +503,7 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then | |||
503 | # Add a PuTTY key to authorized_keys | 503 | # Add a PuTTY key to authorized_keys |
504 | rm -f ${OBJ}/putty.rsa2 | 504 | rm -f ${OBJ}/putty.rsa2 |
505 | if ! puttygen -t rsa -o ${OBJ}/putty.rsa2 \ | 505 | if ! puttygen -t rsa -o ${OBJ}/putty.rsa2 \ |
506 | --random-device=/dev/urandom \ | ||
506 | --new-passphrase /dev/null < /dev/null > /dev/null; then | 507 | --new-passphrase /dev/null < /dev/null > /dev/null; then |
507 | echo "Your installed version of PuTTY is too old to support --new-passphrase; trying without (may require manual interaction) ..." >&2 | 508 | echo "Your installed version of PuTTY is too old to support --new-passphrase; trying without (may require manual interaction) ..." >&2 |
508 | puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null | 509 | puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null |