[openssh-commits] [openssh] 03/03: upstream: Skip DH group generation test if binaries don't support

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 7cdf9fdcf11aaaa98c2bd22c92882ea559e772ad
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Tue Jul 23 08:19:29 2019 +0000

    upstream: Skip DH group generation test if binaries don't support
    
    DH-GEX.
    
    OpenBSD-Regress-ID: 7c918230d969ecf7656babd6191a74526bffbffd
---
 regress/keygen-moduli.sh | 15 ++++++++++++---
 1 file 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

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.