From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Tue, 20 Aug 2024 07:52:43 +0000 (+0000)
Subject: upstream: Add Compression=no to default ssh_config.
X-Git-Tag: V_9_9_P1~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57d02c9ea36aebad4e7146d46e041b6b2e582f7f;p=thirdparty%2Fopenssh-portable.git

upstream: Add Compression=no to default ssh_config.

All of the rekey tests use it (otherwise the encrypted byte counts would
not match) so this lets us simplify the command lines.

OpenBSD-Regress-ID: dab7ce10f4cf6c68827eb8658141272aab3ea262
---

diff --git a/regress/rekey.sh b/regress/rekey.sh
index de9c417d9..f1ed4c569 100644
--- a/regress/rekey.sh
+++ b/regress/rekey.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: rekey.sh,v 1.22 2024/08/20 07:41:35 dtucker Exp $
+#	$OpenBSD: rekey.sh,v 1.23 2024/08/20 07:52:43 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="rekey"
@@ -8,6 +8,8 @@ LOG=${TEST_SSH_LOGFILE}
 rm -f ${LOG}
 cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
 
+echo "Compression no" >> $OBJ/ssh_proxy
+
 # Test rekeying based on data volume only.
 # Arguments will be passed to ssh.
 ssh_data_rekeying()
@@ -20,7 +22,7 @@ ssh_data_rekeying()
 		_opts="$_opts -o$_kexopt"
 	fi
 	rm -f ${COPY} ${LOG}
-	_opts="$_opts -oCompression=no"
+	_opts="$_opts"
 	${SSH} <${DATA} $_opts -v -F $OBJ/ssh_proxy somehost "cat > ${COPY}"
 	if [ $? -ne 0 ]; then
 		fail "ssh failed ($@)"
@@ -70,13 +72,13 @@ fi
 
 for s in 16 1k 128k 256k; do
 	verbose "client rekeylimit ${s}"
-	ssh_data_rekeying "" -oCompression=no -oRekeyLimit=$s
+	ssh_data_rekeying "" -oRekeyLimit=$s
 done
 
 for s in 5 10; do
 	verbose "client rekeylimit default ${s}"
 	rm -f ${COPY} ${LOG}
-	${SSH} < ${DATA} -oCompression=no -oRekeyLimit="default $s" -F \
+	${SSH} < ${DATA} -oRekeyLimit="default $s" -F \
 		$OBJ/ssh_proxy somehost "cat >${COPY};sleep $s;sleep 10"
 	if [ $? -ne 0 ]; then
 		fail "ssh failed"
@@ -93,7 +95,7 @@ done
 for s in 5 10; do
 	verbose "client rekeylimit default ${s} no data"
 	rm -f ${COPY} ${LOG}
-	${SSH} -oCompression=no -oRekeyLimit="default $s" -F \
+	${SSH} -oRekeyLimit="default $s" -F \
 		$OBJ/ssh_proxy somehost "sleep $s;sleep 10"
 	if [ $? -ne 0 ]; then
 		fail "ssh failed"
@@ -111,7 +113,7 @@ for s in 16 1k 128k 256k; do
 	cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
 	echo "rekeylimit ${s}" >>$OBJ/sshd_proxy
 	rm -f ${COPY} ${LOG}
-	${SSH} -oCompression=no -F $OBJ/ssh_proxy somehost "cat ${DATA}" \
+	${SSH} -F $OBJ/ssh_proxy somehost "cat ${DATA}" \
 	    > ${COPY}
 	if [ $? -ne 0 ]; then
 		fail "ssh failed"
@@ -130,7 +132,7 @@ for s in 5 10; do
 	cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
 	echo "rekeylimit default ${s}" >>$OBJ/sshd_proxy
 	rm -f ${COPY} ${LOG}
-	${SSH} -oCompression=no -F $OBJ/ssh_proxy somehost "sleep $s;sleep 10"
+	${SSH} -F $OBJ/ssh_proxy somehost "sleep $s;sleep 10"
 	if [ $? -ne 0 ]; then
 		fail "ssh failed"
 	fi