1 files changed, 14 insertions, 6 deletions

diff --git a/regress/rekey.sh b/regress/rekey.sh
index cf9401ea0..fd452b034 100644
--- a/regress/rekey.sh
+++ b/regress/rekey.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: rekey.sh,v 1.14 2013/11/21 03:18:51 djm Exp $
+#       $OpenBSD: rekey.sh,v 1.15 2014/04/21 22:15:37 djm Exp $
 #       Placed in the Public Domain.
 
 tid="rekey"
@@ -6,14 +6,22 @@ tid="rekey"
 LOG=${TEST_SSH_LOGFILE}
 
 rm -f ${LOG}
+cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
 
 # Test rekeying based on data volume only.
 # Arguments will be passed to ssh.
 ssh_data_rekeying()
 {
+        _kexopt=$1 ; shift
+        _opts="$@"
+        if ! test -z "$_kexopts" ; then
+                cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
+                echo "$_kexopt" >> $OBJ/sshd_proxy
+                _opts="$_opts -o$_kexopt"
+        fi
         rm -f ${COPY} ${LOG}
-        ${SSH} <${DATA} -oCompression=no $@ -v -F $OBJ/ssh_proxy somehost \
-                "cat > ${COPY}"
+        _opts="$_opts -oCompression=no"
+        ${SSH} <${DATA} $_opts -v -F $OBJ/ssh_proxy somehost "cat > ${COPY}"
         if [ $? -ne 0 ]; then
                 fail "ssh failed ($@)"
         fi
@@ -41,7 +49,7 @@ done
 
 for opt in $opts; do
         verbose "client rekey $opt"
-        ssh_data_rekeying -oRekeyLimit=256k -o$opt
+        ssh_data_rekeying "$opt" -oRekeyLimit=256k
 done
 
 # AEAD ciphers are magical so test with all KexAlgorithms
@@ -49,14 +57,14 @@ if ${SSH} -Q cipher-auth | grep '^.*$' >/dev/null 2>&1 ; then
   for c in `${SSH} -Q cipher-auth`; do
     for kex in `${SSH} -Q kex`; do
         verbose "client rekey $c $kex"
-        ssh_data_rekeying -oRekeyLimit=256k -oCiphers=$c -oKexAlgorithms=$kex
+        ssh_data_rekeying "KexAlgorithms=$kex" -oRekeyLimit=256k -oCiphers=$c
     done
   done
 fi
 
 for s in 16 1k 128k 256k; do
         verbose "client rekeylimit ${s}"
-        ssh_data_rekeying -oCompression=no -oRekeyLimit=$s
+        ssh_data_rekeying "" -oCompression=no -oRekeyLimit=$s
 done
 
 for s in 5 10; do