summaryrefslogtreecommitdiff
path: root/regress/usr.bin/ssh/dhgex.sh
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2019-09-27 05:25:13 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2019-09-27 05:25:13 +0000
commitf6ac2c0b10e31971013faa92a811072edcb1f9be (patch)
tree9fa0af86c1964a5340495221a20b136180e62fbb /regress/usr.bin/ssh/dhgex.sh
parent2f329f867c88e49b8de1da837feafde9f6249983 (diff)
Test for empty result in expected bits. Remove CRs from log as they
confuse tools on some platforms. Re-enable the 3des-cbc test.
Diffstat (limited to 'regress/usr.bin/ssh/dhgex.sh')
-rw-r--r--regress/usr.bin/ssh/dhgex.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/regress/usr.bin/ssh/dhgex.sh b/regress/usr.bin/ssh/dhgex.sh
index 61fc178e890..ceb3b5d23c5 100644
--- a/regress/usr.bin/ssh/dhgex.sh
+++ b/regress/usr.bin/ssh/dhgex.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: dhgex.sh,v 1.4 2017/05/08 01:52:49 djm Exp $
+# $OpenBSD: dhgex.sh,v 1.5 2019/09/27 05:25:12 dtucker Exp $
# Placed in the Public Domain.
tid="dhgex"
@@ -28,15 +28,19 @@ ssh_test_dhgex()
if [ $? -ne 0 ]; then
fail "ssh failed ($@)"
fi
+ # Remove CRs.
+ sed 's/\r//' ${LOG} >${LOG}.new
+ mv ${LOG}.new ${LOG}
# 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)
+ # check what we got.
gotbits="`awk '/bits set:/{print $4}' ${LOG} | head -1 | cut -f2 -d/`"
- if [ "$gotbits" -lt "$bits" ]; then
+ trace "expected '$bits' got '$gotbits'"
+ if [ -z "$gotbits" ] || [ "$gotbits" -lt "$bits" ]; then
fatal "$tid expected $bits bit group, got $gotbits"
fi
}
@@ -52,7 +56,7 @@ check()
done
}
-#check 2048 3des-cbc
+check 3072 3des-cbc # 112 bits.
check 3072 `${SSH} -Q cipher | grep 128`
check 7680 `${SSH} -Q cipher | grep 192`
check 8192 `${SSH} -Q cipher | grep 256`