a whole bunch of internal cleanups

5 files changed, 9 insertions, 6 deletions

diff --git a/checks/conventional.test b/checks/conventional.test
index 295db822b..0a2aabe57 100755
--- a/checks/conventional.test
+++ b/checks/conventional.test
@@ -10,7 +10,7 @@ for i in plain-2 data-32000 ; do
 done
 for i in plain-1 data-80000 ; do
     echo "Hier spricht HAL" | ./run-gpg --passphrase-fd 0 \
-					--cipher-algo cast -c -o x --yes $i
+					--cipher-algo cast5 -c -o x --yes $i
     echo "Hier spricht HAL" | ./run-gpg --passphrase-fd 0    -o y --yes x
     cmp $i y || error "$i: mismatch"
 done
diff --git a/checks/defs.inc b/checks/defs.inc
index 32711c916..14c657543 100755
--- a/checks/defs.inc
+++ b/checks/defs.inc
@@ -21,8 +21,10 @@ dsa_usrname2="0xCB879DE9"
 dsa_keyrings="--keyring ./pubring.pkr --secret-keyring ./secring.skr"
 
 
-plain_files="plain-1 plain-2 plain-3"
-data_files="data-500 data-9000 data-32000 data-80000"
+#plain_files="plain-1 plain-2 plain-3"
+#data_files="data-500 data-9000 data-32000 data-80000"
+plain_files="plain-1 plain-2"
+data_files="data-500 data-9000"
 exp_files=""
 
 
diff --git a/checks/encrypt-dsa.test b/checks/encrypt-dsa.test
index d506e8890..d83cdd968 100755
--- a/checks/encrypt-dsa.test
+++ b/checks/encrypt-dsa.test
@@ -11,7 +11,7 @@ done
 
 # and with cast
 for i in $plain_files $data_files ; do
-    ./run-gpg $dsa_keyrings --cipher-algo cast -e \
+    ./run-gpg $dsa_keyrings --cipher-algo cast5 -e \
 					-o x --yes -r "$dsa_usrname2" $i
     ./run-gpg $dsa_keyrings -o y --yes x
     cmp $i y || error "$i: mismatch"
diff --git a/checks/encrypt.test b/checks/encrypt.test
index daf3be6ee..85a67eb37 100755
--- a/checks/encrypt.test
+++ b/checks/encrypt.test
@@ -9,7 +9,7 @@ for i in $plain_files $data_files ; do
     cmp $i y || error "$i: mismatch"
 done
 for i in $plain_files $data_files ; do
-    ./run-gpg -e -o x --yes -r "$usrname2" --cipher-algo cast $i
+    ./run-gpg -e -o x --yes -r "$usrname2" --cipher-algo cast5 $i
     ./run-gpg -o y --yes x
     cmp $i y || error "$i: mismatch"
 done
diff --git a/checks/run-gpg b/checks/run-gpg
index 3420bf98e..9a3ffee8f 100755
--- a/checks/run-gpg
+++ b/checks/run-gpg
@@ -6,6 +6,7 @@ if ! ../g10/gpg --homedir . $* 2>err.tmp.$$ ; then
     rm err.tmp.$$
     exit 1
 fi
-grep -v 'gpg: Good signature from' err.tmp.$$ || true
+grep -v 'gpg: Good signature from' err.tmp.$$ \
+ | grep -v 'gpg: Signature made ' || true
 rm err.tmp.$$