- (dtucker) [regress/try-ciphers.sh] Skip acss if not compiled in (eg if we

   built with openssl < 0.9.7)

diff --git a/ChangeLog b/ChangeLog
index 9fcd54c1aea085e2ebeb90db90560e014a94b205..fec8280c0d1aa671aa45b7a10757c240e990b4f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,8 @@
    - dtucker@cvs.openbsd.org 2004/02/28 13:44:45
      [regress/try-ciphers.sh]
      Test acss too; ok markus@
+ - (dtucker) [regress/try-ciphers.sh] Skip acss if not compiled in (eg if we
+   built with openssl < 0.9.7)
 
 20040226
  - (bal) KNF our sshlogin.c even if the code looks nothing like upstream

diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index 103f410a804ec9e47e7fbc38417589d51796c933..15827e25040feac4c75037f1909224a1b78ae878 100644 (file)
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -29,6 +29,9 @@ for c in $ciphers; do
        fi
 done
 
+if ! ${SSH} -oCiphers=acss@openssh.org 2>&1 | grep "Bad SSH2 cipher" >/dev/null
+then
+
 echo "Ciphers acss@openssh.org" >> $OBJ/sshd_proxy
 c=acss@openssh.org
 for m in $macs; do
@@ -39,3 +42,5 @@ for m in $macs; do
                fail "ssh -2 failed with mac $m cipher $c"
        fi
 done
+
+fi