tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2013/05/16 03:33:30 

[regress/rekey.sh]
     test rekeying when there's no data being transferred
This commit is contained in:
Darren Tucker 2013-05-17 09:43:33 +10:00
parent a8a62fcc46
commit c31c8729c1
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -28,11 +28,14 @@
[regress/multiplex.sh] [regress/multiplex.sh]
Write mux master logs to regress.log instead of ssh.log to keep separate Write mux master logs to regress.log instead of ssh.log to keep separate
- djm@cvs.openbsd.org 2013/05/10 03:46:14 - djm@cvs.openbsd.org 2013/05/10 03:46:14
[modpipe.c] [regress/modpipe.c]
sync some portability changes from portable OpenSSH (id sync only) sync some portability changes from portable OpenSSH (id sync only)
- dtucker@cvs.openbsd.org 2013/05/16 02:10:35 - dtucker@cvs.openbsd.org 2013/05/16 02:10:35
[rekey.sh] [regress/rekey.sh]
Add test for time-based rekeying Add test for time-based rekeying
- dtucker@cvs.openbsd.org 2013/05/16 03:33:30
[regress/rekey.sh]
test rekeying when there's no data being transferred
20130516 20130516
- (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be

26
regress/rekey.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: rekey.sh,v 1.4 2013/05/16 02:10:35 dtucker Exp $ # $OpenBSD: rekey.sh,v 1.5 2013/05/16 03:33:30 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="rekey during transfer data" 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 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 for s in 16 1k 128k 256k; do
trace "rekeylimit ${s}" verbose "rekeylimit ${s}"
rm -f ${COPY} ${LOG} rm -f ${COPY} ${LOG}
cat $DATA | \ cat $DATA | \
${SSH} -oCompression=no -oRekeyLimit=$s \ ${SSH} -oCompression=no -oRekeyLimit=$s \
@ -29,12 +29,12 @@ for s in 16 1k 128k 256k; do
fi fi
done done
for s in 5 10 15 ; do for s in 5 10; do
trace "rekeylimit default ${s}" verbose "rekeylimit default ${s}"
rm -f ${COPY} ${LOG} rm -f ${COPY} ${LOG}
cat $DATA | \ cat $DATA | \
${SSH} -oCompression=no -oRekeyLimit="default $s" -F \ ${SSH} -oCompression=no -oRekeyLimit="default $s" -F \
$OBJ/ssh_proxy somehost "cat >${COPY};sleep $s;sleep 5" $OBJ/ssh_proxy somehost "cat >${COPY};sleep $s;sleep 3"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
fail "ssh failed" fail "ssh failed"
fi fi
@ -47,4 +47,20 @@ for s in 5 10 15 ; do
fi fi
done done
for s in 5 10; do
verbose "rekeylimit default ${s} no data"
rm -f ${COPY} ${LOG}
${SSH} -oCompression=no -oRekeyLimit="default $s" -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} rm -f ${COPY} ${DATA}