]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Indicate if we're using a cached key in trace output.
authordtucker@openbsd.org <dtucker@openbsd.org>
Sat, 4 Apr 2020 23:04:41 +0000 (23:04 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Sun, 5 Apr 2020 00:58:53 +0000 (10:58 +1000)
OpenBSD-Regress-ID: 409a7b0e59d1272890fda507651c0c3d2d3c0d89

regress/test-exec.sh

index f5e3ee6f53c5872eaa758ab78c8491b03ce87bdb..62f5dfc46343fac3f47c0ce69518bff8647e82af 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: test-exec.sh,v 1.75 2020/01/31 23:25:08 djm Exp $
+#      $OpenBSD: test-exec.sh,v 1.76 2020/04/04 23:04:41 dtucker Exp $
 #      Placed in the Public Domain.
 
 #SUDO=sudo
@@ -537,14 +537,16 @@ maybe_filter_sk() {
 
 SSH_KEYTYPES=`$SSH -Q key-plain | maybe_filter_sk`
 SSH_HOSTKEY_TYPES=`$SSH -Q key-plain | maybe_filter_sk`
+
 for t in ${SSH_KEYTYPES}; do
        # generate user key
-       trace "generating key type $t"
        if [ ! -f $OBJ/$t ] || [ ${SSHKEYGEN_BIN} -nt $OBJ/$t ]; then
+               trace "generating key type $t"
                rm -f $OBJ/$t
                ${SSHKEYGEN} -q -N '' -t $t  -f $OBJ/$t ||\
                        fail "ssh-keygen for $t failed"
+       else
+               trace "using cached key type $t"
        fi
 
        # setup authorized keys