tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Use a default value for $OPENSSL, 

allowing it to be overridden. Do the same in the PuTTY tests since it's
needed there and not exported by test-exec.sh.

OpenBSD-Regress-ID: c49dcd6aa7602a8606b7afa192196ca1fa65de16
This commit is contained in:
dtucker@openbsd.org 2021-06-01 23:56:20 +00:00 committed by Darren Tucker
parent 07660b3c99
commit 9d482295c9
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
regress/ssh2putty.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# $OpenBSD: ssh2putty.sh,v 1.6 2021/05/24 10:25:18 dtucker Exp $ # $OpenBSD: ssh2putty.sh,v 1.7 2021/06/01 23:56:20 dtucker Exp $
if test "x$1" = "x" -o "x$2" = "x" -o "x$3" = "x" ; then if test "x$1" = "x" -o "x$2" = "x" -o "x$3" = "x" ; then
echo "Usage: ssh2putty hostname port ssh-private-key" echo "Usage: ssh2putty hostname port ssh-private-key"
@ -10,6 +10,8 @@ HOST=$1
PORT=$2 PORT=$2
KEYFILE=$3 KEYFILE=$3
OPENSSL="${OPENSSL:-openssl}"
# XXX - support DSA keys too # XXX - support DSA keys too
if grep "BEGIN RSA PRIVATE KEY" $KEYFILE >/dev/null 2>&1 ; then if grep "BEGIN RSA PRIVATE KEY" $KEYFILE >/dev/null 2>&1 ; then
: :

4
regress/test-exec.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: test-exec.sh,v 1.80 2021/05/24 10:25:18 dtucker Exp $ # $OpenBSD: test-exec.sh,v 1.81 2021/06/01 23:56:20 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
#SUDO=sudo #SUDO=sudo
@ -100,7 +100,7 @@ CONCH=conch
# Tools used by multiple tests # Tools used by multiple tests
NC=$OBJ/netcat NC=$OBJ/netcat
OPENSSL=openssl OPENSSL="${OPENSSL:-openssl}"
if [ "x$TEST_SSH_SSH" != "x" ]; then if [ "x$TEST_SSH_SSH" != "x" ]; then
SSH="${TEST_SSH_SSH}" SSH="${TEST_SSH_SSH}"