upstream: In PuTTY interop test, don't assume the PuTTY major

version is 0. Patch from cjwatson at debian.org via bz#3671.

OpenBSD-Regress-ID: 835ed03c1b04ad46be82e674495521f11b840191

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index a109904cc40be169ca0bf90f095d820491242401..d7b9f6ca8efd4852087521bd537d68966e64da2a 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: test-exec.sh,v 1.108 2024/03/08 11:34:10 dtucker Exp $
+#      $OpenBSD: test-exec.sh,v 1.109 2024/03/25 01:28:29 dtucker Exp $
 #      Placed in the Public Domain.
 
 #SUDO=sudo
@@ -810,17 +810,18 @@ puttysetup() {
        echo "ProxyLocalhost=1" >> ${OBJ}/.putty/sessions/localhost_proxy
 
        PUTTYVER="`${PLINK} --version | awk '/plink: Release/{print $3}'`"
+       PUTTYMAJORVER="`echo ${PUTTYVER} | cut -f1 -d.`"
        PUTTYMINORVER="`echo ${PUTTYVER} | cut -f2 -d.`"
-       verbose "plink version ${PUTTYVER} minor ${PUTTYMINORVER}"
+       verbose "plink version ${PUTTYVER} major ${PUTTYMAJORVER} minor ${PUTTYMINORVER}"
 
        # Re-enable ssh-rsa on older PuTTY versions since they don't do newer
        # key types.
-       if [ "$PUTTYMINORVER" -lt "76" ]; then
+       if [ "$PUTTYMAJORVER" -eq "0" ] && [ "$PUTTYMINORVER" -lt "76" ]; then
                echo "HostKeyAlgorithms +ssh-rsa" >> ${OBJ}/sshd_proxy
                echo "PubkeyAcceptedKeyTypes +ssh-rsa" >> ${OBJ}/sshd_proxy
        fi
 
-       if [ "$PUTTYMINORVER" -le "64" ]; then
+       if [ "$PUTTYMAJORVER" -eq "0" ] && [ "$PUTTYMINORVER" -le "64" ]; then
                echo "KexAlgorithms +diffie-hellman-group14-sha1" \
                    >>${OBJ}/sshd_proxy
        fi