diff options
author | Damien Miller <djm@mindrot.org> | 2014-05-15 15:07:53 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-05-15 15:07:53 +1000 |
commit | edb1af50441d19fb2dd9ccb4d75bf14473fca584 (patch) | |
tree | c07867fd0c92fdda87b3b5005ce4d14b39f7bc06 /regress/dhgex.sh | |
parent | 54343e95c70994695f8842fb22836321350198d3 (diff) |
- djm@cvs.openbsd.org 2014/04/21 22:15:37
[dhgex.sh integrity.sh kextype.sh rekey.sh try-ciphers.sh]
repair regress tests broken by server-side default cipher/kex/mac changes
by ensuring that the option under test is included in the server's
algorithm list
Diffstat (limited to 'regress/dhgex.sh')
-rw-r--r-- | regress/dhgex.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/regress/dhgex.sh b/regress/dhgex.sh index 4c1a3d83c..57fca4a32 100644 --- a/regress/dhgex.sh +++ b/regress/dhgex.sh | |||
@@ -1,10 +1,11 @@ | |||
1 | # $OpenBSD: dhgex.sh,v 1.1 2014/01/25 04:35:32 dtucker Exp $ | 1 | # $OpenBSD: dhgex.sh,v 1.2 2014/04/21 22:15:37 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="dhgex" | 4 | tid="dhgex" |
5 | 5 | ||
6 | LOG=${TEST_SSH_LOGFILE} | 6 | LOG=${TEST_SSH_LOGFILE} |
7 | rm -f ${LOG} | 7 | rm -f ${LOG} |
8 | cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak | ||
8 | 9 | ||
9 | kexs=`${SSH} -Q kex | grep diffie-hellman-group-exchange` | 10 | kexs=`${SSH} -Q kex | grep diffie-hellman-group-exchange` |
10 | 11 | ||
@@ -14,6 +15,9 @@ ssh_test_dhgex() | |||
14 | cipher="$1"; shift | 15 | cipher="$1"; shift |
15 | kex="$1"; shift | 16 | kex="$1"; shift |
16 | 17 | ||
18 | cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy | ||
19 | echo "KexAlgorithms=$kex" >> $OBJ/sshd_proxy | ||
20 | echo "Ciphers=$cipher" >> $OBJ/sshd_proxy | ||
17 | rm -f ${LOG} | 21 | rm -f ${LOG} |
18 | opts="-oKexAlgorithms=$kex -oCiphers=$cipher" | 22 | opts="-oKexAlgorithms=$kex -oCiphers=$cipher" |
19 | groupsz="1024<$bits<8192" | 23 | groupsz="1024<$bits<8192" |