diff options
| author | djm <djm> | 2014-05-15 05:07:53 +0000 |
|---|---|---|
| committer | djm <djm> | 2014-05-15 05:07:53 +0000 |
| commit | 21ca574071c0d4bde8904000c5fdfb36efa4493d (patch) | |
| tree | 09b9ab57373e6f42d44799fb974e31575d347493 /regress/dhgex.sh | |
| parent | ea67846cb3bd3ae681da8d4443e0fed4e8b8134e (diff) | |
| download | openssh-21ca574071c0d4bde8904000c5fdfb36efa4493d.tar.gz | |
- 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 4c1a3d83..57fca4a3 100644 --- a/regress/dhgex.sh +++ b/regress/dhgex.sh @@ -1,10 +1,11 @@ -# $OpenBSD: dhgex.sh,v 1.1 2014/01/25 04:35:32 dtucker Exp $ +# $OpenBSD: dhgex.sh,v 1.2 2014/04/21 22:15:37 djm Exp $ # Placed in the Public Domain. tid="dhgex" LOG=${TEST_SSH_LOGFILE} rm -f ${LOG} +cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak kexs=`${SSH} -Q kex | grep diffie-hellman-group-exchange` @@ -14,6 +15,9 @@ ssh_test_dhgex() cipher="$1"; shift kex="$1"; shift + cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy + echo "KexAlgorithms=$kex" >> $OBJ/sshd_proxy + echo "Ciphers=$cipher" >> $OBJ/sshd_proxy rm -f ${LOG} opts="-oKexAlgorithms=$kex -oCiphers=$cipher" groupsz="1024<$bits<8192" |