* defs.inc (all_cipher_algos): New function to return all ciphers we

support.  This is safer than the previous setup which could hide that
some ciphers weren't being tested.  Plus, this automatically tests any
new ciphers we may add.

* conventional.test, encrypt-test, encrypt-dsa.test,
conventional-mdc.test: Use it here.

checks/defs.inc

@@ -121,15 +121,6 @@ have_pubkey_algo () {
   fi
 }
 
-have_cipher_algo () {
-  if  ../g10/gpg --homedir .  --version | grep "Cipher:.*$1" >/dev/null
-  then
-	true
-  else
-	false
-  fi
-}
-
 have_hash_algo () {
   if  ../g10/gpg --homedir .  --version | grep "Hash:.*$1" >/dev/null
   then
@@ -139,6 +130,10 @@ have_hash_algo () {
   fi
 }
 
+all_cipher_algos () {
+  ../g10/gpg --homedir . --version | grep "Cipher" | sed 's/^Cipher: //; s/,//g'
+}
+
 set -e
 pgmname=`basename $0`
 #trap cleanup SIGHUP SIGINT SIGQUIT