diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-11-07 15:00:51 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-11-07 15:00:51 +1100 |
commit | 234557762ba1096a867ca6ebdec07efebddb5153 (patch) | |
tree | 4b22a77d9f5f43e66461d11c05722abaf9ffdfda | |
parent | bbfb9b0f386aab0c3e19d11f136199ef1b9ad0ef (diff) |
- dtucker@cvs.openbsd.org 2013/11/04 12:27:42
[regress/rekey.sh]
Test rekeying with all KexAlgorithms.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | regress/rekey.sh | 13 |
2 files changed, 13 insertions, 3 deletions
@@ -24,6 +24,9 @@ | |||
24 | - markus@cvs.openbsd.org 2013/11/02 22:39:53 | 24 | - markus@cvs.openbsd.org 2013/11/02 22:39:53 |
25 | [regress/kextype.sh] | 25 | [regress/kextype.sh] |
26 | add curve25519-sha256@libssh.org | 26 | add curve25519-sha256@libssh.org |
27 | - dtucker@cvs.openbsd.org 2013/11/04 12:27:42 | ||
28 | [regress/rekey.sh] | ||
29 | Test rekeying with all KexAlgorithms. | ||
27 | 30 | ||
28 | 20131104 | 31 | 20131104 |
29 | - (djm) OpenBSD CVS Sync | 32 | - (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 @@ | |||
1 | # $OpenBSD: rekey.sh,v 1.8 2013/05/17 04:29:14 dtucker Exp $ | 1 | # $OpenBSD: rekey.sh,v 1.9 2013/11/04 12:27:42 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="rekey" | 4 | tid="rekey" |
@@ -7,11 +7,17 @@ LOG=${TEST_SSH_LOGFILE} | |||
7 | 7 | ||
8 | rm -f ${LOG} | 8 | rm -f ${LOG} |
9 | 9 | ||
10 | kexalgs="curve25519-sha256@libssh.org ecdh-sha2-nistp256 \ | ||
11 | ecdh-sha2-nistp384 ecdh-sha2-nistp521 diffie-hellman-group-exchange-sha256 \ | ||
12 | diffie-hellman-group-exchange-sha1 diffie-hellman-group14-sha1 \ | ||
13 | diffie-hellman-group1-sha1" | ||
14 | |||
10 | for s in 16 1k 128k 256k; do | 15 | for s in 16 1k 128k 256k; do |
11 | verbose "client rekeylimit ${s}" | 16 | for a in $kexalgs; do |
17 | verbose "client rekeylimit ${s} ${a}" | ||
12 | rm -f ${COPY} ${LOG} | 18 | rm -f ${COPY} ${LOG} |
13 | cat $DATA | \ | 19 | cat $DATA | \ |
14 | ${SSH} -oCompression=no -oRekeyLimit=$s \ | 20 | ${SSH} -oCompression=no -oRekeyLimit=$s -oKexAlgorithms=$a \ |
15 | -v -F $OBJ/ssh_proxy somehost "cat > ${COPY}" | 21 | -v -F $OBJ/ssh_proxy somehost "cat > ${COPY}" |
16 | if [ $? -ne 0 ]; then | 22 | if [ $? -ne 0 ]; then |
17 | fail "ssh failed" | 23 | fail "ssh failed" |
@@ -23,6 +29,7 @@ for s in 16 1k 128k 256k; do | |||
23 | if [ $n -lt 1 ]; then | 29 | if [ $n -lt 1 ]; then |
24 | fail "no rekeying occured" | 30 | fail "no rekeying occured" |
25 | fi | 31 | fi |
32 | done | ||
26 | done | 33 | done |
27 | 34 | ||
28 | for s in 5 10; do | 35 | for s in 5 10; do |