summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-01-31 21:59:35 +1100
committerDamien Miller <djm@mindrot.org>2006-01-31 21:59:35 +1100
commitec7b2f12f00cf0655d88dc543323621df2f36c64 (patch)
tree9d11b30c38959fe32c6a7da27edc7a9bdf4fea4d
parent76be6b8765f88b72c354941b523efbefa14561fe (diff)
- djm@cvs.openbsd.org 2005/05/24 04:10:54
[regress/try-ciphers.sh] oops, new arcfour modes here too
-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 cb5a6fc48..932ba4151 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,9 @@
46 [regress/test-exec.sh] 46 [regress/test-exec.sh]
47 force addressfamily=inet for tests, unbreaking dynamic-forward regress for 47 force addressfamily=inet for tests, unbreaking dynamic-forward regress for
48 recently committed nc SOCKS5 changes 48 recently committed nc SOCKS5 changes
49 - djm@cvs.openbsd.org 2005/05/24 04:10:54
50 [try-ciphers.sh]
51 oops, new arcfour modes here too
49 52
5020060129 5320060129
51 - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the 54 - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the
@@ -3771,4 +3774,4 @@
3771 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3774 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3772 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3775 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3773 3776
3774$Id: ChangeLog,v 1.4104 2006/01/31 10:59:01 djm Exp $ 3777$Id: ChangeLog,v 1.4105 2006/01/31 10:59:35 djm Exp $
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index c6e1b9152..379fe353a 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -1,9 +1,10 @@
1# $OpenBSD: try-ciphers.sh,v 1.9 2004/02/28 13:44:45 dtucker Exp $ 1# $OpenBSD: try-ciphers.sh,v 1.10 2005/05/24 04:10:54 djm 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
7 arcfour128 arcfour256 arcfour
7 aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se 8 aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se
8 aes128-ctr aes192-ctr aes256-ctr" 9 aes128-ctr aes192-ctr aes256-ctr"
9macs="hmac-sha1 hmac-md5 hmac-sha1-96 hmac-md5-96" 10macs="hmac-sha1 hmac-md5 hmac-sha1-96 hmac-md5-96"