diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2002-03-15 13:08:57 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2002-03-15 13:08:57 +0000 |
| commit | 97569307e000e086fd6cf20aeaa2dfa10dc5c67d (patch) | |
| tree | 7558e4bd541518153fc7db49c5234b6e96d2cdf4 /regress/usr.bin/ssh/ssh-com.sh | |
| parent | 841669506a0a2a64f4ab24abde38d5547a842918 (diff) | |
allow specification of binary-under-test with
$TEST_SSH_{SSH,SSHD,SSHAGENT,SSHADD,SSHKEYGEN,SSHKEYSCAN}
Diffstat (limited to 'regress/usr.bin/ssh/ssh-com.sh')
| -rw-r--r-- | regress/usr.bin/ssh/ssh-com.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/regress/usr.bin/ssh/ssh-com.sh b/regress/usr.bin/ssh/ssh-com.sh index d8209671194..6a199fa6583 100644 --- a/regress/usr.bin/ssh/ssh-com.sh +++ b/regress/usr.bin/ssh/ssh-com.sh @@ -1,4 +1,4 @@ -# $OpenBSD: ssh-com.sh,v 1.2 2002/02/16 01:09:47 markus Exp $ +# $OpenBSD: ssh-com.sh,v 1.3 2002/03/15 13:08:56 markus Exp $ # Placed in the Public Domain. tid="connect to ssh.com server" @@ -50,13 +50,13 @@ sed "s/HostKeyAlias.*/HostKeyAlias ssh2-localhost-with-alias/" \ # we need a DSA key for rm -f ${OBJ}/dsa ${OBJ}/dsa.pub -ssh-keygen -q -N '' -t dsa -f ${OBJ}/dsa +${SSHKEYGEN} -q -N '' -t dsa -f ${OBJ}/dsa # setup userdir, try rsa first mkdir -p ${OBJ}/${USER} cp /dev/null ${OBJ}/${USER}/authorization for t in rsa dsa; do - ssh-keygen -e -f ${OBJ}/$t.pub > ${OBJ}/${USER}/$t.com + ${SSHKEYGEN} -e -f ${OBJ}/$t.pub > ${OBJ}/${USER}/$t.com echo Key $t.com >> ${OBJ}/${USER}/authorization echo IdentityFile ${OBJ}/$t >> ${OBJ}/ssh_config_com done @@ -64,7 +64,7 @@ done # convert and append DSA hostkey ( echo -n 'ssh2-localhost-with-alias,127.0.0.1,::1 ' - ssh-keygen -if ${SRC}/dsa_ssh2.pub + ${SSHKEYGEN} -if ${SRC}/dsa_ssh2.pub ) >> $OBJ/known_hosts # go for it @@ -75,7 +75,7 @@ for v in ${VERSIONS}; do fi trace "sshd2 ${v}" PROXY="proxycommand ${sshd2} -qif ${OBJ}/sshd2_config 2> /dev/null" - ssh -qF ${OBJ}/ssh_config_com -o "${PROXY}" dummy exit 0 + ${SSH} -qF ${OBJ}/ssh_config_com -o "${PROXY}" dummy exit 0 if [ $? -ne 0 ]; then fail "ssh connect to sshd2 ${v} failed" fi @@ -96,7 +96,8 @@ for v in ${VERSIONS}; do for m in $macs; do for c in $ciphers; do trace "sshd2 ${v} cipher $c mac $m" - ssh -c $c -m $m -qF ${OBJ}/ssh_config_com -o "${PROXY}" dummy exit 0 + verbose "test ${tid}: sshd2 ${v} cipher $c mac $m" + ${SSH} -c $c -m $m -qF ${OBJ}/ssh_config_com -o "${PROXY}" dummy exit 0 if [ $? -ne 0 ]; then fail "ssh connect to sshd2 ${v} with $c/$m failed" fi |