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

2013-02-12 11:31:38 +11:00 · 2013-02-12 11:31:38 +11:00 · 2f20de5e3f
parent 58e2c5b394
commit 2f20de5e3f
2 changed files with 1 additions and 7 deletions
--- a/1
+++ b/1
@ -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
--- 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