Mailing List Archive

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit c54a50359b9cecddbf3ffcdc26efcb3cd6071ec1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Fri Oct 20 07:37:07 2023 +0000

upstream: Allow overriding the locations of the Dropbear binaries

similar to what we do for the PuTTY ones.

OpenBSD-Regress-ID: 7de0e00518fb0c8fdc5f243b7f82f523c936049c
---
Makefile.in | 4 ++++
configure.ac | 6 ++++++
regress/test-exec.sh | 14 +++++++++++++-
3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 0acc0366..0e2fdf31 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -754,6 +754,10 @@ interop-tests t-exec file-tests extra-tests: regress-prep regress-binaries $(TAR
TEST_SSH_PLINK="plink" \
TEST_SSH_PUTTYGEN="puttygen" \
TEST_SSH_CONCH="conch" \
+ TEST_SSH_DROPBEAR="@DROPBEAR@" \
+ TEST_SSH_DROPBEARKEY="@DROPBEARKEY@" \
+ TEST_SSH_DROPBEARCONVERT="@DROPBEARCONVERT@" \
+ TEST_SSH_DBCLIENT="@DBCLIENT@" \
TEST_SSH_IPV6="@TEST_SSH_IPV6@" \
TEST_SSH_UTF8="@TEST_SSH_UTF8@" \
TEST_SHELL="$(TEST_SHELL)" \
diff --git a/configure.ac b/configure.ac
index 0581a2c5..c3fe76cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5576,6 +5576,12 @@ AC_SUBST([TEST_MALLOC_OPTIONS], [$TEST_MALLOC_OPTIONS])
AC_SUBST([UNSUPPORTED_ALGORITHMS], [$unsupported_algorithms])
AC_SUBST([DEPEND], [$(cat $srcdir/.depend)])

+# Binaries for interop tests.
+AC_PATH_PROG([DROPBEAR], [dropbear])
+AC_PATH_PROG([DBCLIENT], [dbclient])
+AC_PATH_PROG([DROPBEARKEY], [dropbearkey])
+AC_PATH_PROG([DROPBEARCONVERT], [dropbearconvert])
+
CFLAGS="${CFLAGS} ${CFLAGS_AFTER}"
LDFLAGS="${LDFLAGS} ${LDFLAGS_AFTER}"

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 995b4890..f39e4654 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: test-exec.sh,v 1.100 2023/10/20 06:56:45 dtucker Exp $
+# $OpenBSD: test-exec.sh,v 1.101 2023/10/20 07:37:07 dtucker Exp $
# Placed in the Public Domain.

#SUDO=sudo
@@ -157,6 +157,18 @@ if [ "x$TEST_SSH_CONCH" != "x" ]; then
*) CONCH=`which ${TEST_SSH_CONCH} 2>/dev/null` ;;
esac
fi
+if [ "x$TEST_SSH_DROPBEAR" != "x" ]; then
+ DROPBEAR="${TEST_SSH_DROPBEAR}"
+fi
+if [ "x$TEST_SSH_DBCLIENT" != "x" ]; then
+ DBCLIENT="${TEST_SSH_DBCLIENT}"
+fi
+if [ "x$TEST_SSH_DROPBEARKEY" != "x" ]; then
+ DROPBEARKEY="${TEST_SSH_DROPBEARKEY}"
+fi
+if [ "x$TEST_SSH_DROPBEARCONVERT" != "x" ]; then
+ DROPBEARCONVERT="${TEST_SSH_DROPBEARCONVERT}"
+fi
if [ "x$TEST_SSH_PKCS11_HELPER" != "x" ]; then
SSH_PKCS11_HELPER="${TEST_SSH_PKCS11_HELPER}"
fi

--
To stop receiving notification emails like this one, please contact
djm@mindrot.org.
_______________________________________________
openssh-commits mailing list
openssh-commits@mindrot.org
https://lists.mindrot.org/mailman/listinfo/openssh-commits