aboutsummaryrefslogtreecommitdiffstats
path: root/tests/openpgp/conventional.test
diff options
context:
space:
mode:
Diffstat (limited to 'tests/openpgp/conventional.test')
-rwxr-xr-xtests/openpgp/conventional.test34
1 files changed, 11 insertions, 23 deletions
diff --git a/tests/openpgp/conventional.test b/tests/openpgp/conventional.test
index 8b75c8a50..1464ee229 100755
--- a/tests/openpgp/conventional.test
+++ b/tests/openpgp/conventional.test
@@ -1,4 +1,12 @@
#!/bin/sh
+# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
+# 2007 Free Software Foundation, Inc.
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved. This file is
+# distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY, to the extent permitted by law; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
. $srcdir/defs.inc || exit 3
@@ -9,29 +17,8 @@ for i in plain-2 data-32000 ; do
cmp $i y || error "$i: mismatch"
done
-algos="3des"
-
-if have_cipher_algo "IDEA"; then
- algos="$algos idea"
-fi
-
-if have_cipher_algo "CAST5"; then
- algos="$algos cast5"
-fi
-
-if have_cipher_algo "BLOWFISH"; then
- algos="$algos blowfish"
-fi
-
-if have_cipher_algo "AES"; then
- algos="$algos aes aes192 aes256"
-fi
-
-if have_cipher_algo "TWOFISH"; then
- algos="$algos twofish"
-fi
-
-for a in $algos; do
+for a in `all_cipher_algos`; do
+ echo_n "$a "
for i in plain-1 data-80000 ; do
echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \
--cipher-algo $a -c -o x --yes $i
@@ -39,3 +26,4 @@ for a in $algos; do
cmp $i y || error "$i: ($a) mismatch"
done
done
+echo_n "| "