summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-11-11 16:55:25 +1100
committerDarren Tucker <dtucker@zip.com.au>2008-11-11 16:55:25 +1100
commit4a6f62d4ae64ff8f868613a8e459720d4ebe263d (patch)
treedc84636e1154d582a4062e1f6f3645c7d2f3326c
parent22662e880f9c61f00908fe3dc27a6988ac2cccd0 (diff)
- djm@cvs.openbsd.org 2008/11/10 02:06:35
[regress/putty-ciphers.sh] PuTTY supports AES CTR modes, so interop test against them too
-rw-r--r--ChangeLog5
-rw-r--r--regress/putty-ciphers.sh4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8849616b6..b6a589ff0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
26 [channels.c] 26 [channels.c]
27 for sshd -T print 'permitopen any' vs. 'permitopen' for case of no 27 for sshd -T print 'permitopen any' vs. 'permitopen' for case of no
28 permitopen's; ok and input dtucker@ 28 permitopen's; ok and input dtucker@
29 - djm@cvs.openbsd.org 2008/11/10 02:06:35
30 [regress/putty-ciphers.sh]
31 PuTTY supports AES CTR modes, so interop test against them too
29 32
3020081105 3320081105
31 - OpenBSD CVS Sync 34 - OpenBSD CVS Sync
@@ -4918,4 +4921,4 @@
4918 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4921 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4919 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4922 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4920 4923
4921$Id: ChangeLog,v 1.5139 2008/11/11 05:40:22 dtucker Exp $ 4924$Id: ChangeLog,v 1.5140 2008/11/11 05:55:25 dtucker Exp $
diff --git a/regress/putty-ciphers.sh b/regress/putty-ciphers.sh
index 40435ef41..441053627 100644
--- a/regress/putty-ciphers.sh
+++ b/regress/putty-ciphers.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: putty-ciphers.sh,v 1.2 2008/06/30 10:31:11 djm Exp $ 1# $OpenBSD: putty-ciphers.sh,v 1.3 2008/11/10 02:06:35 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="putty ciphers" 4tid="putty ciphers"
@@ -10,7 +10,7 @@ if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
10 fatal "putty interop tests not enabled" 10 fatal "putty interop tests not enabled"
11fi 11fi
12 12
13for c in aes blowfish 3des arcfour ; do 13for c in aes blowfish 3des arcfour aes128-ctr aes192-ctr aes256-ctr ; do
14 verbose "$tid: cipher $c" 14 verbose "$tid: cipher $c"
15 cp ${OBJ}/.putty/sessions/localhost_proxy \ 15 cp ${OBJ}/.putty/sessions/localhost_proxy \
16 ${OBJ}/.putty/sessions/cipher_$c 16 ${OBJ}/.putty/sessions/cipher_$c