summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--regress/try-ciphers.sh4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d9f4c8d99..cf5aeac73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@
18 -Wshadow change. 18 -Wshadow change.
19 - (dtucker) [auth.c openbsd-compat/port-aix.c openbsd-compat/port-aix.h] 19 - (dtucker) [auth.c openbsd-compat/port-aix.c openbsd-compat/port-aix.h]
20 Move loginrestrictions test to port-aix.c, replace with a generic hook. 20 Move loginrestrictions test to port-aix.c, replace with a generic hook.
21 - (tim) [regress/try-ciphers.sh] "if ! some_command" is not portable.
21 22
2220040622 2320040622
23 - (bal) [auth-passwd.c auth1.c] Clean up unused variables. 24 - (bal) [auth-passwd.c auth1.c] Clean up unused variables.
@@ -1390,4 +1391,4 @@
1390 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1391 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1391 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1392 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1392 1393
1393$Id: ChangeLog,v 1.3439 2004/06/23 03:45:24 dtucker Exp $ 1394$Id: ChangeLog,v 1.3440 2004/06/23 03:53:02 tim Exp $
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index 15827e250..c6e1b9152 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -29,8 +29,10 @@ for c in $ciphers; do
29 fi 29 fi
30done 30done
31 31
32if ! ${SSH} -oCiphers=acss@openssh.org 2>&1 | grep "Bad SSH2 cipher" >/dev/null 32if ${SSH} -oCiphers=acss@openssh.org 2>&1 | grep "Bad SSH2 cipher" >/dev/null
33then 33then
34 :
35else
34 36
35echo "Ciphers acss@openssh.org" >> $OBJ/sshd_proxy 37echo "Ciphers acss@openssh.org" >> $OBJ/sshd_proxy
36c=acss@openssh.org 38c=acss@openssh.org