diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-04-04 23:04:41 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2020-04-05 10:58:53 +1000 |
commit | d1d5f728511e2338b7c994968d301d8723012264 (patch) | |
tree | 362b0adf4ce5c4edb4e66f9fbfbdb53bfaa73fd2 /regress/test-exec.sh | |
parent | a398251a4627367c78bc483c70c2ec973223f82c (diff) |
upstream: Indicate if we're using a cached key in trace output.
OpenBSD-Regress-ID: 409a7b0e59d1272890fda507651c0c3d2d3c0d89
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r-- | regress/test-exec.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index f5e3ee6f5..62f5dfc46 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 |
@@ -537,14 +537,16 @@ maybe_filter_sk() { | |||
537 | 537 | ||
538 | SSH_KEYTYPES=`$SSH -Q key-plain | maybe_filter_sk` | 538 | SSH_KEYTYPES=`$SSH -Q key-plain | maybe_filter_sk` |
539 | SSH_HOSTKEY_TYPES=`$SSH -Q key-plain | maybe_filter_sk` | 539 | SSH_HOSTKEY_TYPES=`$SSH -Q key-plain | maybe_filter_sk` |
540 | 540 | ||
541 | for t in ${SSH_KEYTYPES}; do | 541 | for t in ${SSH_KEYTYPES}; do |
542 | # generate user key | 542 | # generate user key |
543 | trace "generating key type $t" | ||
544 | if [ ! -f $OBJ/$t ] || [ ${SSHKEYGEN_BIN} -nt $OBJ/$t ]; then | 543 | if [ ! -f $OBJ/$t ] || [ ${SSHKEYGEN_BIN} -nt $OBJ/$t ]; then |
544 | trace "generating key type $t" | ||
545 | rm -f $OBJ/$t | 545 | rm -f $OBJ/$t |
546 | ${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t ||\ | 546 | ${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t ||\ |
547 | fail "ssh-keygen for $t failed" | 547 | fail "ssh-keygen for $t failed" |
548 | else | ||
549 | trace "using cached key type $t" | ||
548 | fi | 550 | fi |
549 | 551 | ||
550 | # setup authorized keys | 552 | # setup authorized keys |