summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-06-18 22:43:13 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-06-18 22:43:13 +1000
commit76437600b285d333896997081b07a04369ca5608 (patch)
treeec4e73c3ca15d770769730650104dea048af2144
parentc43362c89a6b6c5b18b4f132a8a584de61caa4a9 (diff)
- (dtucker) OpenBSD CVS Sync (regress/)
- markus@cvs.openbsd.org 2003/06/12 15:40:01 [try-ciphers.sh] add ctr
-rw-r--r--ChangeLog5
-rw-r--r--regress/try-ciphers.sh5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 55403046e..6bd455c2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,9 @@
39 - mouring@cvs.openbsd.org 2003/05/15 04:07:12 39 - mouring@cvs.openbsd.org 2003/05/15 04:07:12
40 [sftp-cmds.sh] 40 [sftp-cmds.sh]
41 Advanced put/get testing for sftp. OK @djm 41 Advanced put/get testing for sftp. OK @djm
42 - markus@cvs.openbsd.org 2003/06/12 15:40:01
43 [try-ciphers.sh]
44 add ctr
42 45
4320030614 4620030614
44 - (djm) Update license on fake-rfc2553.[ch]; ok itojun@ 47 - (djm) Update license on fake-rfc2553.[ch]; ok itojun@
@@ -554,4 +557,4 @@
554 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 557 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
555 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 558 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
556 559
557$Id: ChangeLog,v 1.2814 2003/06/18 12:41:41 dtucker Exp $ 560$Id: ChangeLog,v 1.2815 2003/06/18 12:43:13 dtucker Exp $
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index 161f039c0..2c727f66c 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -1,10 +1,11 @@
1# $OpenBSD: try-ciphers.sh,v 1.7 2002/04/03 09:30:01 markus Exp $ 1# $OpenBSD: try-ciphers.sh,v 1.8 2003/06/12 15:40:01 markus Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="try ciphers" 4tid="try ciphers"
5 5
6ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc arcfour 6ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc arcfour
7 aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se" 7 aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se
8 aes128-ctr aes192-ctr aes256-ctr"
8macs="hmac-sha1 hmac-md5 hmac-sha1-96 hmac-md5-96" 9macs="hmac-sha1 hmac-md5 hmac-sha1-96 hmac-md5-96"
9 10
10for c in $ciphers; do 11for c in $ciphers; do