summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-02-12 11:31:38 +1100
committerDamien Miller <djm@mindrot.org>2013-02-12 11:31:38 +1100
commit2f20de5e3f1c60eee3c9bda52289aff5c037dd08 (patch)
tree089896522c4130f1eadb66e658df22b538125122
parent58e2c5b3947122f82ecc0158180ba260e6e59166 (diff)
- (djm) [regress/try-ciphers.sh] clean up CVS merge botch
-rw-r--r--ChangeLog1
-rw-r--r--regress/try-ciphers.sh7
2 files changed, 1 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index e744747e..567bdf29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,7 @@
- djm@cvs.openbsd.org 2013/02/11 23:58:51
[regress/try-ciphers.sh]
remove acss here too
+ - (djm) [regress/try-ciphers.sh] clean up CVS merge botch
20130211
- (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 054a1f14..87ec7497 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -46,10 +46,3 @@ for c in $ciphers; do
fi
done
-if ${SSH} -oCiphers=acss@openssh.org 2>&1 | grep "Bad SSH2 cipher" >/dev/null
-then
- :
-else
-
-
-fi