diff options
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r-- | regress/test-exec.sh | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index f5e3ee6f5..5dc975d07 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.75 2020/01/31 23:25:08 djm Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.76 2020/04/04 23:04:41 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -23,6 +23,16 @@ else | |||
23 | PORT=4242 | 23 | PORT=4242 |
24 | fi | 24 | fi |
25 | 25 | ||
26 | # If configure tells us to use a different egrep, create a wrapper function | ||
27 | # to call it. This means we don't need to change all the tests that depend | ||
28 | # on a good implementation. | ||
29 | if test "x${EGREP}" != "x"; then | ||
30 | egrep () | ||
31 | { | ||
32 | ${EGREP} "$@" | ||
33 | } | ||
34 | fi | ||
35 | |||
26 | if [ -x /usr/ucb/whoami ]; then | 36 | if [ -x /usr/ucb/whoami ]; then |
27 | USER=`/usr/ucb/whoami` | 37 | USER=`/usr/ucb/whoami` |
28 | elif whoami >/dev/null 2>&1; then | 38 | elif whoami >/dev/null 2>&1; then |
@@ -512,7 +522,9 @@ fi | |||
512 | rm -f $OBJ/known_hosts $OBJ/authorized_keys_$USER | 522 | rm -f $OBJ/known_hosts $OBJ/authorized_keys_$USER |
513 | 523 | ||
514 | SSH_SK_PROVIDER= | 524 | SSH_SK_PROVIDER= |
515 | if [ -f "${SRC}/misc/sk-dummy/obj/sk-dummy.so" ] ; then | 525 | if ! config_defined ENABLE_SK; then |
526 | trace skipping sk-dummy | ||
527 | elif [ -f "${SRC}/misc/sk-dummy/obj/sk-dummy.so" ] ; then | ||
516 | SSH_SK_PROVIDER="${SRC}/misc/sk-dummy/obj/sk-dummy.so" | 528 | SSH_SK_PROVIDER="${SRC}/misc/sk-dummy/obj/sk-dummy.so" |
517 | elif [ -f "${SRC}/misc/sk-dummy/sk-dummy.so" ] ; then | 529 | elif [ -f "${SRC}/misc/sk-dummy/sk-dummy.so" ] ; then |
518 | SSH_SK_PROVIDER="${SRC}/misc/sk-dummy/sk-dummy.so" | 530 | SSH_SK_PROVIDER="${SRC}/misc/sk-dummy/sk-dummy.so" |
@@ -537,14 +549,16 @@ maybe_filter_sk() { | |||
537 | 549 | ||
538 | SSH_KEYTYPES=`$SSH -Q key-plain | maybe_filter_sk` | 550 | SSH_KEYTYPES=`$SSH -Q key-plain | maybe_filter_sk` |
539 | SSH_HOSTKEY_TYPES=`$SSH -Q key-plain | maybe_filter_sk` | 551 | SSH_HOSTKEY_TYPES=`$SSH -Q key-plain | maybe_filter_sk` |
540 | 552 | ||
541 | for t in ${SSH_KEYTYPES}; do | 553 | for t in ${SSH_KEYTYPES}; do |
542 | # generate user key | 554 | # generate user key |
543 | trace "generating key type $t" | ||
544 | if [ ! -f $OBJ/$t ] || [ ${SSHKEYGEN_BIN} -nt $OBJ/$t ]; then | 555 | if [ ! -f $OBJ/$t ] || [ ${SSHKEYGEN_BIN} -nt $OBJ/$t ]; then |
556 | trace "generating key type $t" | ||
545 | rm -f $OBJ/$t | 557 | rm -f $OBJ/$t |
546 | ${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t ||\ | 558 | ${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t ||\ |
547 | fail "ssh-keygen for $t failed" | 559 | fail "ssh-keygen for $t failed" |
560 | else | ||
561 | trace "using cached key type $t" | ||
548 | fi | 562 | fi |
549 | 563 | ||
550 | # setup authorized keys | 564 | # setup authorized keys |