summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-02-28 10:21:26 +1100
committerDamien Miller <djm@mindrot.org>2014-02-28 10:21:26 +1100
commitb84392328425e4b9a71f8bde5fe6a4a4c48d3ec4 (patch)
tree08478c06ecd8fc1f27bc3c0d35d706e5c29b3979 /regress
parent1e2aa3d90472293ea19008f02336d6d68aa05793 (diff)
- dtucker@cvs.openbsd.org 2014/01/25 04:35:32
[regress/Makefile regress/dhgex.sh] Add a test for DH GEX sizes
Diffstat (limited to 'regress')
-rw-r--r--regress/Makefile3
-rw-r--r--regress/dhgex.sh54
2 files changed, 56 insertions, 1 deletions
diff --git a/regress/Makefile b/regress/Makefile
index 0c66b177..5405ca39 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2013/12/06 13:52:46 markus Exp $
+# $OpenBSD: Makefile,v 1.68 2014/01/25 04:35:32 dtucker Exp $
REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t-exec
tests: $(REGRESS_TARGETS)
@@ -23,6 +23,7 @@ LTESTS= connect \
transfer \
banner \
rekey \
+ dhgex \
stderr-data \
stderr-after-eof \
broken-pipe \
diff --git a/regress/dhgex.sh b/regress/dhgex.sh
new file mode 100644
index 00000000..4c1a3d83
--- /dev/null
+++ b/regress/dhgex.sh
@@ -0,0 +1,54 @@
+# $OpenBSD: dhgex.sh,v 1.1 2014/01/25 04:35:32 dtucker Exp $
+# Placed in the Public Domain.
+
+tid="dhgex"
+
+LOG=${TEST_SSH_LOGFILE}
+rm -f ${LOG}
+
+kexs=`${SSH} -Q kex | grep diffie-hellman-group-exchange`
+
+ssh_test_dhgex()
+{
+ bits="$1"; shift
+ cipher="$1"; shift
+ kex="$1"; shift
+
+ rm -f ${LOG}
+ opts="-oKexAlgorithms=$kex -oCiphers=$cipher"
+ groupsz="1024<$bits<8192"
+ verbose "$tid bits $bits $kex $cipher"
+ ${SSH} ${opts} $@ -vvv -F ${OBJ}/ssh_proxy somehost true
+ if [ $? -ne 0 ]; then
+ fail "ssh failed ($@)"
+ fi
+ # check what we request
+ grep "SSH2_MSG_KEX_DH_GEX_REQUEST($groupsz) sent" ${LOG} >/dev/null
+ if [ $? != 0 ]; then
+ got=`egrep "SSH2_MSG_KEX_DH_GEX_REQUEST(.*) sent" ${LOG}`
+ fail "$tid unexpected GEX sizes, expected $groupsz, got $got"
+ fi
+ # check what we got (depends on contents of system moduli file)
+ gotbits="`awk '/bits set:/{print $4}' ${LOG} | head -1 | cut -f2 -d/`"
+ if [ "$gotbits" -lt "$bits" ]; then
+ fatal "$tid expected $bits bit group, got $gotbits"
+ fi
+}
+
+check()
+{
+ bits="$1"; shift
+
+ for c in $@; do
+ for k in $kexs; do
+ ssh_test_dhgex $bits $c $k
+ done
+ done
+}
+
+#check 2048 3des-cbc
+check 3072 `${SSH} -Q cipher | grep 128`
+check 3072 arcfour blowfish-cbc
+check 7680 `${SSH} -Q cipher | grep 192`
+check 8192 `${SSH} -Q cipher | grep 256`
+check 8192 rijndael-cbc@lysator.liu.se chacha20-poly1305@openssh.com