RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-27 12:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
remove /usr/bin/time calls around tests, makes diffing test
runs harder. Based on patch from Mike Frysinger

Upstream-Regress-ID: 81c1083b14dcf473b23d2817882f40b346ebc95c
This commit is contained in:
djm@openbsd.org 2017-03-20 22:08:06 +00:00 committed by Damien Miller
parent 6b853c6f8b
commit 096fb65084
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
regress/keytype.sh
View File

@ -1,13 +1,8 @@
# $OpenBSD: keytype.sh,v 1.4 2015/07/10 06:23:25 markus Exp $ # $OpenBSD: keytype.sh,v 1.5 2017/03/20 22:08:06 djm Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="login with different key types" tid="login with different key types"
TIME=`which time 2>/dev/null`
if test ! -x "$TIME"; then
TIME=""
fi
cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak
@ -26,8 +21,8 @@ for kt in $ktypes; do
rm -f $OBJ/key.$kt rm -f $OBJ/key.$kt
bits=`echo ${kt} | awk -F- '{print $2}'` bits=`echo ${kt} | awk -F- '{print $2}'`
type=`echo ${kt} | awk -F- '{print $1}'` type=`echo ${kt} | awk -F- '{print $1}'`
printf "keygen $type, $bits bits:\t" verbose "keygen $type, $bits bits"
${TIME} ${SSHKEYGEN} -b $bits -q -N '' -t $type -f $OBJ/key.$kt ||\ ${SSHKEYGEN} -b $bits -q -N '' -t $type -f $OBJ/key.$kt ||\
fail "ssh-keygen for type $type, $bits bits failed" fail "ssh-keygen for type $type, $bits bits failed"
done done
@ -63,8 +58,8 @@ for ut in $ktypes; do
) > $OBJ/known_hosts ) > $OBJ/known_hosts
cat $OBJ/key.$ut.pub > $OBJ/authorized_keys_$USER cat $OBJ/key.$ut.pub > $OBJ/authorized_keys_$USER
for i in $tries; do for i in $tries; do
printf "userkey $ut, hostkey ${ht}:\t" verbose "userkey $ut, hostkey ${ht}"
${TIME} ${SSH} -F $OBJ/ssh_proxy 999.999.999.999 true ${SSH} -F $OBJ/ssh_proxy 999.999.999.999 true
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
fail "ssh userkey $ut, hostkey $ht failed" fail "ssh userkey $ut, hostkey $ht failed"
fi fi