]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Remove override disabling DH-GEX.
authorDarren Tucker <dtucker@dtucker.net>
Thu, 25 Jul 2019 08:36:28 +0000 (18:36 +1000)
committerDarren Tucker <dtucker@dtucker.net>
Thu, 25 Jul 2019 10:11:45 +0000 (20:11 +1000)
The DH-GEX override doesn't work when build without OpenSSL, and
we'll prefer curve25519 these days, removing the need for it.

regress/integrity.sh

index 3eda40f0a3d348559a2d7a5ec1dbce8fdc07248c..5ba6bf6ab0b03b1f04f8db0b0c2f18d6abcc9975 100644 (file)
@@ -14,8 +14,8 @@ macs="$macs `${SSH} -Q cipher-auth`"
 
 # avoid DH group exchange as the extra traffic makes it harder to get the
 # offset into the stream right.
-echo "KexAlgorithms diffie-hellman-group14-sha1,diffie-hellman-group1-sha1" \
-       >> $OBJ/ssh_proxy
+#echo "KexAlgorithms -diffie-hellman-group*" \
+#      >> $OBJ/ssh_proxy
 
 # sshd-command for proxy (see test-exec.sh)
 cmd="$SUDO sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy"