diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-02-29 20:38:26 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-02-29 20:38:26 +1100 |
commit | 9468ba33a1d1a5fd6258658dee1058500e1082f0 (patch) | |
tree | 39ee8b53ec0eacdee6840f813b9560211afad235 | |
parent | 68b184c75d771f6a878e09e1fafc66e293e8ba27 (diff) |
- dtucker@cvs.openbsd.org 2004/02/28 13:44:45
[regress/try-ciphers.sh]
Test acss too; ok markus@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regress/try-ciphers.sh | 13 |
2 files changed, 16 insertions, 2 deletions
@@ -28,6 +28,9 @@ | |||
28 | - dtucker@cvs.openbsd.org 2004/02/28 12:16:57 | 28 | - dtucker@cvs.openbsd.org 2004/02/28 12:16:57 |
29 | [regress/dynamic-forward.sh] | 29 | [regress/dynamic-forward.sh] |
30 | Make dynamic-forward understand nc's new output. ok markus@ | 30 | Make dynamic-forward understand nc's new output. ok markus@ |
31 | - dtucker@cvs.openbsd.org 2004/02/28 13:44:45 | ||
32 | [regress/try-ciphers.sh] | ||
33 | Test acss too; ok markus@ | ||
31 | 34 | ||
32 | 20040226 | 35 | 20040226 |
33 | - (bal) KNF our sshlogin.c even if the code looks nothing like upstream | 36 | - (bal) KNF our sshlogin.c even if the code looks nothing like upstream |
@@ -833,4 +836,4 @@ | |||
833 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 836 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
834 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 837 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
835 | 838 | ||
836 | $Id: ChangeLog,v 1.3268 2004/02/29 09:37:06 dtucker Exp $ | 839 | $Id: ChangeLog,v 1.3269 2004/02/29 09:38:26 dtucker Exp $ |
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh index 2c727f66c..103f410a8 100644 --- a/regress/try-ciphers.sh +++ b/regress/try-ciphers.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: try-ciphers.sh,v 1.8 2003/06/12 15:40:01 markus Exp $ | 1 | # $OpenBSD: try-ciphers.sh,v 1.9 2004/02/28 13:44:45 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="try ciphers" | 4 | tid="try ciphers" |
@@ -28,3 +28,14 @@ for c in $ciphers; do | |||
28 | fail "ssh -1 failed with cipher $c" | 28 | fail "ssh -1 failed with cipher $c" |
29 | fi | 29 | fi |
30 | done | 30 | done |
31 | |||
32 | echo "Ciphers acss@openssh.org" >> $OBJ/sshd_proxy | ||
33 | c=acss@openssh.org | ||
34 | for m in $macs; do | ||
35 | trace "proto 2 $c mac $m" | ||
36 | verbose "test $tid: proto 2 cipher $c mac $m" | ||
37 | ${SSH} -F $OBJ/ssh_proxy -2 -m $m -c $c somehost true | ||
38 | if [ $? -ne 0 ]; then | ||
39 | fail "ssh -2 failed with mac $m cipher $c" | ||
40 | fi | ||
41 | done | ||