- (djm) [regress/try-ciphers.sh] clean up CVS merge botch

2 files changed, 1 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index e744747e3..567bdf290 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 054a1f14e..87ec7497a 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