From 234557762ba1096a867ca6ebdec07efebddb5153 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 7 Nov 2013 15:00:51 +1100
Subject: [PATCH]    - dtucker@cvs.openbsd.org 2013/11/04 12:27:42     
 [regress/rekey.sh]      Test rekeying with all KexAlgorithms.

---
 ChangeLog        |  3 +++
 regress/rekey.sh | 13 ++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7e5eeb2fa..930975a95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,9 @@
    - markus@cvs.openbsd.org 2013/11/02 22:39:53
      [regress/kextype.sh]
      add curve25519-sha256@libssh.org
+   - dtucker@cvs.openbsd.org 2013/11/04 12:27:42
+     [regress/rekey.sh]
+     Test rekeying with all KexAlgorithms.
 
 20131104
  - (djm) OpenBSD CVS Sync
diff --git a/regress/rekey.sh b/regress/rekey.sh
index 8eb7efaf9..5f32961c8 100644
--- a/regress/rekey.sh
+++ b/regress/rekey.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: rekey.sh,v 1.8 2013/05/17 04:29:14 dtucker Exp $
+#	$OpenBSD: rekey.sh,v 1.9 2013/11/04 12:27:42 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="rekey"
@@ -7,11 +7,17 @@ LOG=${TEST_SSH_LOGFILE}
 
 rm -f ${LOG}
 
+kexalgs="curve25519-sha256@libssh.org ecdh-sha2-nistp256 \
+ecdh-sha2-nistp384 ecdh-sha2-nistp521 diffie-hellman-group-exchange-sha256 \
+diffie-hellman-group-exchange-sha1 diffie-hellman-group14-sha1 \
+diffie-hellman-group1-sha1"
+
 for s in 16 1k 128k 256k; do
-	verbose "client rekeylimit ${s}"
+    for a in $kexalgs; do
+	verbose "client rekeylimit ${s} ${a}"
 	rm -f ${COPY} ${LOG}
 	cat $DATA | \
-		${SSH} -oCompression=no -oRekeyLimit=$s \
+		${SSH} -oCompression=no -oRekeyLimit=$s -oKexAlgorithms=$a \
 			-v -F $OBJ/ssh_proxy somehost "cat > ${COPY}"
 	if [ $? -ne 0 ]; then
 		fail "ssh failed"
@@ -23,6 +29,7 @@ for s in 16 1k 128k 256k; do
 	if [ $n -lt 1 ]; then
 		fail "no rekeying occured"
 	fi
+    done
 done
 
 for s in 5 10; do