| test-exec.sh (180746) | test-exec.sh (180750) |
|---|---|
| 1# $OpenBSD: test-exec.sh,v 1.31 2007/12/21 04:13:53 djm Exp $ | 1# $OpenBSD: test-exec.sh,v 1.35 2008/06/28 13:57:25 djm Exp $ |
| 2# Placed in the Public Domain. 3 4#SUDO=sudo 5 6# Unbreak GNU head(1) 7_POSIX2_VERSION=199209 8export _POSIX2_VERSION 9 --- 55 unchanged lines hidden (view full) --- 65SSHADD=ssh-add 66SSHKEYGEN=ssh-keygen 67SSHKEYSCAN=ssh-keyscan 68SFTP=sftp 69SFTPSERVER=/usr/libexec/openssh/sftp-server 70SCP=scp 71 72# Interop testing | 2# Placed in the Public Domain. 3 4#SUDO=sudo 5 6# Unbreak GNU head(1) 7_POSIX2_VERSION=199209 8export _POSIX2_VERSION 9 --- 55 unchanged lines hidden (view full) --- 65SSHADD=ssh-add 66SSHKEYGEN=ssh-keygen 67SSHKEYSCAN=ssh-keyscan 68SFTP=sftp 69SFTPSERVER=/usr/libexec/openssh/sftp-server 70SCP=scp 71 72# Interop testing |
| 73PLINK=/usr/local/bin/plink 74PUTTYGEN=/usr/local/bin/puttygen | 73PLINK=plink 74PUTTYGEN=puttygen 75CONCH=conch |
| 75 76if [ "x$TEST_SSH_SSH" != "x" ]; then 77 SSH="${TEST_SSH_SSH}" 78fi 79if [ "x$TEST_SSH_SSHD" != "x" ]; then 80 SSHD="${TEST_SSH_SSHD}" 81fi 82if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then --- 26 unchanged lines hidden (view full) --- 109fi 110if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then 111 # Find real binary, if it exists 112 case "${TEST_SSH_PUTTYGEN}" in 113 /*) PUTTYGEN="${TEST_SSH_PUTTYGEN}" ;; 114 *) PUTTYGEN=`which ${TEST_SSH_PUTTYGEN} 2>/dev/null` ;; 115 esac 116fi | 76 77if [ "x$TEST_SSH_SSH" != "x" ]; then 78 SSH="${TEST_SSH_SSH}" 79fi 80if [ "x$TEST_SSH_SSHD" != "x" ]; then 81 SSHD="${TEST_SSH_SSHD}" 82fi 83if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then --- 26 unchanged lines hidden (view full) --- 110fi 111if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then 112 # Find real binary, if it exists 113 case "${TEST_SSH_PUTTYGEN}" in 114 /*) PUTTYGEN="${TEST_SSH_PUTTYGEN}" ;; 115 *) PUTTYGEN=`which ${TEST_SSH_PUTTYGEN} 2>/dev/null` ;; 116 esac 117fi |
| 118if [ "x$TEST_SSH_CONCH" != "x" ]; then 119 # Find real binary, if it exists 120 case "${TEST_SSH_CONCH}" in 121 /*) CONCH="${TEST_SSH_CONCH}" ;; 122 *) CONCH=`which ${TEST_SSH_CONCH} 2>/dev/null` ;; 123 esac 124fi |
|
| 117 118# Path to sshd must be absolute for rexec 119case "$SSHD" in 120/*) ;; 121*) SSHD=`which sshd` ;; 122esac 123 124if [ "x$TEST_SSH_LOGFILE" = "x" ]; then --- 157 unchanged lines hidden (view full) --- 282 $SUDO cp $OBJ/$t $OBJ/host.$t 283 echo HostKey $OBJ/host.$t >> $OBJ/sshd_config 284 285 # don't use SUDO for proxy connect 286 echo HostKey $OBJ/$t >> $OBJ/sshd_proxy 287done 288chmod 644 $OBJ/authorized_keys_$USER 289 | 125 126# Path to sshd must be absolute for rexec 127case "$SSHD" in 128/*) ;; 129*) SSHD=`which sshd` ;; 130esac 131 132if [ "x$TEST_SSH_LOGFILE" = "x" ]; then --- 157 unchanged lines hidden (view full) --- 290 $SUDO cp $OBJ/$t $OBJ/host.$t 291 echo HostKey $OBJ/host.$t >> $OBJ/sshd_config 292 293 # don't use SUDO for proxy connect 294 echo HostKey $OBJ/$t >> $OBJ/sshd_proxy 295done 296chmod 644 $OBJ/authorized_keys_$USER 297 |
| 290# If PuTTY is present, prepare keys and configuration | 298# Activate Twisted Conch tests if the binary is present 299REGRESS_INTEROP_CONCH=no 300if test -x "$CONCH" ; then 301 REGRESS_INTEROP_CONCH=yes 302fi 303 304# If PuTTY is present and we are running a PuTTY test, prepare keys and 305# configuration |
| 291REGRESS_INTEROP_PUTTY=no 292if test -x "$PUTTYGEN" -a -x "$PLINK" ; then | 306REGRESS_INTEROP_PUTTY=no 307if test -x "$PUTTYGEN" -a -x "$PLINK" ; then |
| 308 REGRESS_INTEROP_PUTTY=yes 309fi 310case "$SCRIPT" in 311*putty*) ;; 312*) REGRESS_INTEROP_PUTTY=no ;; 313esac 314 315if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then |
|
| 293 mkdir -p ${OBJ}/.putty 294 295 # Add a PuTTY key to authorized_keys 296 rm -f ${OBJ}/putty.rsa2 297 puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null 298 puttygen -O public-openssh ${OBJ}/putty.rsa2 \ 299 >> $OBJ/authorized_keys_$USER 300 --- 53 unchanged lines hidden --- | 316 mkdir -p ${OBJ}/.putty 317 318 # Add a PuTTY key to authorized_keys 319 rm -f ${OBJ}/putty.rsa2 320 puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null 321 puttygen -O public-openssh ${OBJ}/putty.rsa2 \ 322 >> $OBJ/authorized_keys_$USER 323 --- 53 unchanged lines hidden --- |