summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2019-07-25 18:36:28 +1000
committerDarren Tucker <dtucker@dtucker.net>2019-07-25 20:11:45 +1000
commit0967a233b8a28907ae8a4a6773c89f21d2ace11b (patch)
tree4bb20326c850c2426b79097b7c1e73f7179f4678
parent061407efc19b41ab4a7485e5adcff2a12befacdb (diff)
Remove override disabling DH-GEX.
The DH-GEX override doesn't work when build without OpenSSL, and we'll prefer curve25519 these days, removing the need for it.
-rw-r--r--regress/integrity.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/integrity.sh b/regress/integrity.sh
index 3eda40f0a..5ba6bf6ab 100644
--- a/regress/integrity.sh
+++ b/regress/integrity.sh
@@ -14,8 +14,8 @@ macs="$macs `${SSH} -Q cipher-auth`"
14 14
15# avoid DH group exchange as the extra traffic makes it harder to get the 15# avoid DH group exchange as the extra traffic makes it harder to get the
16# offset into the stream right. 16# offset into the stream right.
17echo "KexAlgorithms diffie-hellman-group14-sha1,diffie-hellman-group1-sha1" \ 17#echo "KexAlgorithms -diffie-hellman-group*" \
18 >> $OBJ/ssh_proxy 18# >> $OBJ/ssh_proxy
19 19
20# sshd-command for proxy (see test-exec.sh) 20# sshd-command for proxy (see test-exec.sh)
21cmd="$SUDO sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy" 21cmd="$SUDO sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy"