RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Skip DH group generation test if binaries don't support 

DH-GEX.

OpenBSD-Regress-ID: 7c918230d969ecf7656babd6191a74526bffbffd
This commit is contained in:
dtucker@openbsd.org 2019-07-23 08:19:29 +00:00 committed by Darren Tucker
parent 3a3eab8bb0
commit 7cdf9fdcf1
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
regress/keygen-moduli.sh
View File

@ -1,18 +1,27 @@
# $OpenBSD: keygen-moduli.sh,v 1.2 2016/09/14 00:45:31 dtucker Exp $
# $OpenBSD: keygen-moduli.sh,v 1.3 2019/07/23 08:19:29 dtucker Exp $
# Placed in the Public Domain.
tid="keygen moduli"
dhgex=0
for kex in `${SSH} -Q kex`; do
case $kex in
diffie-hellman-group*) dhgex=1 ;;
esac
done
# Try "start at the beginning and stop after 1", "skip 1 then stop after 1"
# and "skip 2 and run to the end with checkpointing". Since our test data
# file has 3 lines, these should always result in 1 line of output.
for i in "-J1" "-j1 -J1" "-j2 -K $OBJ/moduli.ckpt"; do
if [ "x$dhgex" = "x1" ]; then
for i in "-J1" "-j1 -J1" "-j2 -K $OBJ/moduli.ckpt"; do
trace "keygen $i"
rm -f $OBJ/moduli.out $OBJ/moduli.ckpt
${SSHKEYGEN} -T $OBJ/moduli.out -f ${SRC}/moduli.in $i 2>/dev/null || \
fail "keygen screen failed $i"
lines=`wc -l <$OBJ/moduli.out`
test "$lines" -eq "1" || fail "expected 1 line, got $lines"
done
done
fi
rm -f $OBJ/moduli.out $OBJ/moduli.ckpt