summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--regress/try-ciphers.sh12
2 files changed, 4 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 01ba1fe33..e744747e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,9 @@
52 - dtucker@cvs.openbsd.org 2013/02/11 21:21:58 52 - dtucker@cvs.openbsd.org 2013/02/11 21:21:58
53 [sshd.c] 53 [sshd.c]
54 Add openssl version to debug output similar to the client. ok markus@ 54 Add openssl version to debug output similar to the client. ok markus@
55 - djm@cvs.openbsd.org 2013/02/11 23:58:51
56 [regress/try-ciphers.sh]
57 remove acss here too
55 58
5620130211 5920130211
57 - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old 60 - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index ef91085c5..054a1f14e 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: try-ciphers.sh,v 1.18 2013/01/12 11:23:53 djm Exp $ 1# $OpenBSD: try-ciphers.sh,v 1.19 2013/02/11 23:58:51 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="try ciphers" 4tid="try ciphers"
@@ -51,15 +51,5 @@ then
51 : 51 :
52else 52else
53 53
54echo "Ciphers acss@openssh.org" >> $OBJ/sshd_proxy
55c=acss@openssh.org
56for m in $macs; do
57 trace "proto 2 $c mac $m"
58 verbose "test $tid: proto 2 cipher $c mac $m"
59 ${SSH} -F $OBJ/ssh_proxy -2 -m $m -c $c somehost true
60 if [ $? -ne 0 ]; then
61 fail "ssh -2 failed with mac $m cipher $c"
62 fi
63done
64 54
65fi 55fi