new releaseV0-2-17

3 files changed, 29 insertions, 1 deletions

diff --git a/checks/Makefile.am b/checks/Makefile.am
index b4a830b42..8de908cca 100644
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@@ -8,7 +8,8 @@ TESTS = version.test \
 	armsigs.test armencrypt.test armencryptp.test \
 	signencrypt.test signencrypt-dsa.test \
 	armsignencrypt.test armdetach.test \
-	armdetachm.test detachm.test genkey1024.test
+	armdetachm.test detachm.test genkey1024.test \
+	conventional.test
 
 
 TEST_FILES = pubring.asc secring.asc gnupg.asc plain-1 plain-2 plain-3o.asc \
diff --git a/checks/conventional.test b/checks/conventional.test
new file mode 100755
index 000000000..295db822b
--- /dev/null
+++ b/checks/conventional.test
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+. defs.inc || exit 3
+
+#info Checking conventional encryption
+for i in plain-2 data-32000 ; do
+    echo "Hier spricht HAL" | ./run-gpg --passphrase-fd 0 -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
+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
+    echo "Hier spricht HAL" | ./run-gpg --passphrase-fd 0    -o y --yes x
+    cmp $i y || error "$i: mismatch"
+done
+
diff --git a/checks/sigs.test b/checks/sigs.test
index 15c464f1e..4b3894c28 100755
--- a/checks/sigs.test
+++ b/checks/sigs.test
@@ -9,3 +9,13 @@ for i in $plain_files $data_files; do
     cmp $i y || error "$i: mismatch"
 done
 
+for da in rmd160 sha1 md5 tiger; do
+    for i in $plain_files; do
+	echo "$usrpass1" | ./run-gpg --passphrase-fd 0 --digest-algo $da \
+				-s -o x --yes $i
+	./run-gpg -o y --yes x
+	cmp $i y || error "$i: mismatch"
+	# process only the first one
+	break
+    done
+done