diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2019-07-23 08:19:29 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-07-23 22:51:22 +1000 |
| commit | 7cdf9fdcf11aaaa98c2bd22c92882ea559e772ad (patch) | |
| tree | 279ea896f274aa230dfc24d064a99f5387e85a6c /regress/keygen-moduli.sh | |
| parent | 3a3eab8bb0da3d2f0f32cb85a1a268bcca6e4d69 (diff) | |
| download | openssh-git-7cdf9fdcf11aaaa98c2bd22c92882ea559e772ad.tar.gz | |
upstream: Skip DH group generation test if binaries don't support
DH-GEX.
OpenBSD-Regress-ID: 7c918230d969ecf7656babd6191a74526bffbffd
Diffstat (limited to 'regress/keygen-moduli.sh')
| -rw-r--r-- | regress/keygen-moduli.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/regress/keygen-moduli.sh b/regress/keygen-moduli.sh index d4e77138..a8eccfb6 100644 --- a/regress/keygen-moduli.sh +++ b/regress/keygen-moduli.sh @@ -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 |