diff options
| author | dtucker <dtucker> | 2013-05-16 23:44:20 +0000 |
|---|---|---|
| committer | dtucker <dtucker> | 2013-05-16 23:44:20 +0000 |
| commit | 7e1f97fbcafff1ff4c29996915fa76666b2de98b (patch) | |
| tree | 3273c67862ae1c4b225ef8feaf545a9ef20a5dd7 | |
| parent | aa58f8dbc7ac999efc9aa67395c5fb6bd5ce9a80 (diff) | |
| download | openssh-7e1f97fbcafff1ff4c29996915fa76666b2de98b.tar.gz | |
- dtucker@cvs.openbsd.org 2013/05/16 04:26:10
[regress/rekey.sh]
add server-side rekey test
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | regress/rekey.sh | 24 |
2 files changed, 23 insertions, 4 deletions
@@ -36,6 +36,9 @@ - dtucker@cvs.openbsd.org 2013/05/16 03:33:30 [regress/rekey.sh] test rekeying when there's no data being transferred + - dtucker@cvs.openbsd.org 2013/05/16 04:26:10 + [regress/rekey.sh] + add server-side rekey test 20130516 - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be diff --git a/regress/rekey.sh b/regress/rekey.sh index 3576a2a0..736da9f9 100644 --- a/regress/rekey.sh +++ b/regress/rekey.sh @@ -1,4 +1,4 @@ -# $OpenBSD: rekey.sh,v 1.5 2013/05/16 03:33:30 dtucker Exp $ +# $OpenBSD: rekey.sh,v 1.6 2013/05/16 04:26:10 dtucker Exp $ # Placed in the Public Domain. tid="rekey during transfer data" @@ -12,7 +12,7 @@ touch ${DATA} dd if=/bin/ls${EXEEXT} of=${DATA} bs=1k seek=511 count=1 > /dev/null 2>&1 for s in 16 1k 128k 256k; do - verbose "rekeylimit ${s}" + verbose "client rekeylimit ${s}" rm -f ${COPY} ${LOG} cat $DATA | \ ${SSH} -oCompression=no -oRekeyLimit=$s \ @@ -30,7 +30,7 @@ for s in 16 1k 128k 256k; do done for s in 5 10; do - verbose "rekeylimit default ${s}" + verbose "client rekeylimit default ${s}" rm -f ${COPY} ${LOG} cat $DATA | \ ${SSH} -oCompression=no -oRekeyLimit="default $s" -F \ @@ -48,7 +48,7 @@ for s in 5 10; do done for s in 5 10; do - verbose "rekeylimit default ${s} no data" + verbose "client rekeylimit default ${s} no data" rm -f ${COPY} ${LOG} ${SSH} -oCompression=no -oRekeyLimit="default $s" -F \ $OBJ/ssh_proxy somehost "sleep $s;sleep 3" @@ -63,4 +63,20 @@ for s in 5 10; do fi done +echo "rekeylimit default 5" >>$OBJ/sshd_proxy +for s in 5 10; do + verbose "server rekeylimit default ${s} no data" + rm -f ${COPY} ${LOG} + ${SSH} -oCompression=no -F $OBJ/ssh_proxy somehost "sleep $s;sleep 3" + if [ $? -ne 0 ]; then + fail "ssh failed" + fi + n=`grep 'NEWKEYS sent' ${LOG} | wc -l` + n=`expr $n - 1` + trace "$n rekeying(s)" + if [ $n -lt 1 ]; then + fail "no rekeying occured" + fi +done + rm -f ${COPY} ${DATA} |