diff options
Diffstat (limited to 'checks')
-rw-r--r-- | checks/Makefile.am | 7 | ||||
-rwxr-xr-x | checks/armdetach.test | 4 | ||||
-rwxr-xr-x | checks/armdetachm.test | 4 | ||||
-rwxr-xr-x | checks/armencrypt.test | 4 | ||||
-rwxr-xr-x | checks/armencryptp.test | 4 | ||||
-rwxr-xr-x | checks/armsignencrypt.test | 4 | ||||
-rwxr-xr-x | checks/armsigs.test | 4 | ||||
-rwxr-xr-x | checks/clearsig.test | 8 | ||||
-rwxr-xr-x | checks/conventional.test | 8 | ||||
-rwxr-xr-x | checks/decrypt-dsa.test | 2 | ||||
-rwxr-xr-x | checks/decrypt.test | 3 | ||||
-rwxr-xr-x | checks/detach.test | 4 | ||||
-rwxr-xr-x | checks/detachm.test | 4 | ||||
-rwxr-xr-x | checks/encrypt-dsa.test | 8 | ||||
-rwxr-xr-x | checks/encrypt.test | 8 | ||||
-rwxr-xr-x | checks/encryptp.test | 2 | ||||
-rwxr-xr-x | checks/mds.test | 4 | ||||
-rwxr-xr-x | checks/seat.test | 4 | ||||
-rwxr-xr-x | checks/signencrypt-dsa.test | 8 | ||||
-rwxr-xr-x | checks/signencrypt.test | 4 | ||||
-rwxr-xr-x | checks/sigs-dsa.test | 8 | ||||
-rwxr-xr-x | checks/sigs.test | 8 | ||||
-rwxr-xr-x | checks/version.test | 2 |
23 files changed, 61 insertions, 55 deletions
diff --git a/checks/Makefile.am b/checks/Makefile.am index bd7d11199..351075206 100644 --- a/checks/Makefile.am +++ b/checks/Makefile.am @@ -19,11 +19,16 @@ TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \ DATA_FILES = data-500 data-9000 data-32000 data-80000 EXTRA_DIST = defs.inc run-gpg run-gpgm $(TESTS) $(TEST_FILES) -CLEANFILES = prepared.stamp x y z out err $(DATA_FILES) +CLEANFILES = prepared.stamp x y z out err $(DATA_FILES) \ + plain-1 plain-2 plain-3 +DISTCLEANFILES = pubring.gpg secring.gpg pubring.pkr secring.skr + check: prepared.stamp +testdata: prepared.stamp + prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \ ./pubring.pkr ./secring.skr $(DATA_FILES) echo timestamp >./prepared.stamp diff --git a/checks/armdetach.test b/checks/armdetach.test index 16d4efe76..c68c5da82 100755 --- a/checks/armdetach.test +++ b/checks/armdetach.test @@ -5,7 +5,7 @@ #info Checking armored detached signatures for i in $plain_files $data_files ; do - echo "$usrpass1" | ./run-gpg --passphrase-fd 0 -sab -o x --yes $i - ./run-gpg -o /dev/null --yes x <$i || error "$i: bad signature" + echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 -sab -o x --yes $i + $srcdir/run-gpg -o /dev/null --yes x <$i || error "$i: bad signature" done diff --git a/checks/armdetachm.test b/checks/armdetachm.test index 5d8d077c2..f628fcf2b 100755 --- a/checks/armdetachm.test +++ b/checks/armdetachm.test @@ -4,6 +4,6 @@ #info Checking armored detached signatures of multiple files i="$plain_files $data_files" -echo "$usrpass1" | ./run-gpg --passphrase-fd 0 -sab -o x --yes $i -cat $i | ./run-gpg -o /dev/null --yes x || error "$i: bad signature" +echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 -sab -o x --yes $i +cat $i | $srcdir/run-gpg -o /dev/null --yes x || error "$i: bad signature" diff --git a/checks/armencrypt.test b/checks/armencrypt.test index 48c60a8b8..cade9dde4 100755 --- a/checks/armencrypt.test +++ b/checks/armencrypt.test @@ -4,8 +4,8 @@ #info Checking armored encryption for i in $plain_files $data_files ; do - ./run-gpg -ea -o x --yes -r "$usrname2" $i - ./run-gpg -o y --yes x + $srcdir/run-gpg -ea -o x --yes -r "$usrname2" $i + $srcdir/run-gpg -o y --yes x cmp $i y || error "$i: mismatch" done diff --git a/checks/armencryptp.test b/checks/armencryptp.test index 37cb4a34b..95a1efd63 100755 --- a/checks/armencryptp.test +++ b/checks/armencryptp.test @@ -4,9 +4,9 @@ #info Checking armored encryption with a pipe for i in $plain_files $data_files ; do - ./run-gpg -ea --yes -r "$usrname2" < $i | tee x | ./run-gpg -o y --yes + $srcdir/run-gpg -ea --yes -r "$usrname2" < $i | tee x | $srcdir/run-gpg -o y --yes cmp $i y || error "$i: mismatch" - ./run-gpg --yes < x > y + $srcdir/run-gpg --yes < x > y cmp $i y || error "$i: mismatch" done diff --git a/checks/armsignencrypt.test b/checks/armsignencrypt.test index daa1b9676..f8ffdaf4d 100755 --- a/checks/armsignencrypt.test +++ b/checks/armsignencrypt.test @@ -6,8 +6,8 @@ #info Checking armored signing and encryption for i in $plain_files $data_files ; do echo "$usrpass1" \ - | ./run-gpg --passphrase-fd 0 -sae -o x --yes -r "$usrname2" $i - ./run-gpg -o y --yes x + | $srcdir/run-gpg --passphrase-fd 0 -sae -o x --yes -r "$usrname2" $i + $srcdir/run-gpg -o y --yes x cmp $i y || error "$i: mismatch" done diff --git a/checks/armsigs.test b/checks/armsigs.test index 5152c2de0..34b5a7fa3 100755 --- a/checks/armsigs.test +++ b/checks/armsigs.test @@ -4,8 +4,8 @@ #info Checking armored signatures for i in $plain_files $data_files ; do - echo "$usrpass1" | ./run-gpg --passphrase-fd 0 -sa -o x --yes $i - ./run-gpg -o y --yes x + echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 -sa -o x --yes $i + $srcdir/run-gpg -o y --yes x cmp $i y || error "$i: mismatch" done diff --git a/checks/clearsig.test b/checks/clearsig.test index d633713c9..69c2544d7 100755 --- a/checks/clearsig.test +++ b/checks/clearsig.test @@ -6,13 +6,13 @@ # but the output has always one. I do not thinkl this is a bug, because # it is clear text and not binary text. for i in $plain_files; do - echo "$usrpass1" | ./run-gpg --passphrase-fd 0 -sat -o x --yes $i - ./run-gpg --verify x + echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 -sat -o x --yes $i + $srcdir/run-gpg --verify x done # and once more to check rfc1991 for i in $plain_files; do - echo "$usrpass1" | ./run-gpg --passphrase-fd 0 \ + echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 \ --rfc1991 --digest-algo md5 -sat -o x --yes $i - ./run-gpg --verify x + $srcdir/run-gpg --verify x done diff --git a/checks/conventional.test b/checks/conventional.test index 9176c0c44..dbf831000 100755 --- a/checks/conventional.test +++ b/checks/conventional.test @@ -4,14 +4,14 @@ #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 + echo "Hier spricht HAL" | $srcdir/run-gpg --passphrase-fd 0 -c -o x --yes $i + echo "Hier spricht HAL" | $srcdir/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 \ + echo "Hier spricht HAL" | $srcdir/run-gpg --passphrase-fd 0 \ --cipher-algo cast5 -c -o x --yes $i - echo "Hier spricht HAL" | ./run-gpg --passphrase-fd 0 -o y --yes x + echo "Hier spricht HAL" | $srcdir/run-gpg --passphrase-fd 0 -o y --yes x cmp $i y || error "$i: mismatch" done diff --git a/checks/decrypt-dsa.test b/checks/decrypt-dsa.test index 08fe2de7e..ba73ddf5f 100755 --- a/checks/decrypt-dsa.test +++ b/checks/decrypt-dsa.test @@ -4,7 +4,7 @@ #info Checking decryption of supplied DSA encrypted file for i in "plain-1" ; do - ./run-gpg $dsa_keyrings -o y --yes $i-pgp.asc + $srcdir/run-gpg $dsa_keyrings -o y --yes $srcdir/$i-pgp.asc cmp $i y || error "$i: mismatch" done diff --git a/checks/decrypt.test b/checks/decrypt.test index 843c9be9d..1d7449401 100755 --- a/checks/decrypt.test +++ b/checks/decrypt.test @@ -4,7 +4,8 @@ #info Checking decryption of supplied files for i in $plain_files ; do - echo "$usrpass1" | ./run-gpg --passphrase-fd 0 -o y --yes $i.asc + echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 \ + -o y --yes $srcdir/$i.asc cmp $i y || error "$i: mismatch" done diff --git a/checks/detach.test b/checks/detach.test index 37700e517..cdad558c1 100755 --- a/checks/detach.test +++ b/checks/detach.test @@ -4,7 +4,7 @@ #info Checking detached signatures for i in $plain_files $data_files ; do - echo "$usrpass1" | ./run-gpg --passphrase-fd 0 -sb -o x --yes $i - ./run-gpg -o /dev/null --yes x <$i || error "$i: bad signature" + echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 -sb -o x --yes $i + $srcdir/run-gpg -o /dev/null --yes x <$i || error "$i: bad signature" done diff --git a/checks/detachm.test b/checks/detachm.test index 5af856f75..b5fb05af5 100755 --- a/checks/detachm.test +++ b/checks/detachm.test @@ -4,6 +4,6 @@ #info Checking detached signatures of multiple files i="$plain_files $data_files" -echo "$usrpass1" | ./run-gpg --passphrase-fd 0 -sb -o x --yes $i -cat $i | ./run-gpg -o /dev/null --yes x || error "$i: bad signature" +echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 -sb -o x --yes $i +cat $i | $srcdir/run-gpg -o /dev/null --yes x || error "$i: bad signature" diff --git a/checks/encrypt-dsa.test b/checks/encrypt-dsa.test index b809700b1..ba0564fd8 100755 --- a/checks/encrypt-dsa.test +++ b/checks/encrypt-dsa.test @@ -4,16 +4,16 @@ #info Checking encryption for i in $plain_files $data_files ; do - ./run-gpg $dsa_keyrings -e -o x --yes -r "$dsa_usrname2" $i - ./run-gpg $dsa_keyrings -o y --yes x + $srcdir/run-gpg $dsa_keyrings -e -o x --yes -r "$dsa_usrname2" $i + $srcdir/run-gpg $dsa_keyrings -o y --yes x cmp $i y || error "$i: mismatch" done # and with cast for i in $plain_files $data_files ; do - ./run-gpg $dsa_keyrings --cipher-algo cast5 -e \ + $srcdir/run-gpg $dsa_keyrings --cipher-algo cast5 -e \ -o x --yes -r "$dsa_usrname2" $i - ./run-gpg $dsa_keyrings -o y --yes x + $srcdir/run-gpg $dsa_keyrings -o y --yes x cmp $i y || error "$i: mismatch" done diff --git a/checks/encrypt.test b/checks/encrypt.test index 07e9a3a24..468136cca 100755 --- a/checks/encrypt.test +++ b/checks/encrypt.test @@ -4,13 +4,13 @@ #info Checking encryption for i in $plain_files $data_files ; do - ./run-gpg -e -o x --yes -r "$usrname2" $i - ./run-gpg -o y --yes x + $srcdir/run-gpg -e -o x --yes -r "$usrname2" $i + $srcdir/run-gpg -o y --yes x 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 cast5 $i - ./run-gpg -o y --yes x + $srcdir/run-gpg -e -o x --yes -r "$usrname2" --cipher-algo cast5 $i + $srcdir/run-gpg -o y --yes x cmp $i y || error "$i: mismatch" done diff --git a/checks/encryptp.test b/checks/encryptp.test index b0af2c626..c63fb822f 100755 --- a/checks/encryptp.test +++ b/checks/encryptp.test @@ -4,7 +4,7 @@ #info Checking encryption with a pipe for i in $plain_files $data_files ; do - ./run-gpg -e --yes -r "$usrname2" <$i | tee yy | ./run-gpg --yes > y + $srcdir/run-gpg -e --yes -r "$usrname2" <$i | tee yy | $srcdir/run-gpg --yes > y cmp $i y || error "$i: mismatch" done diff --git a/checks/mds.test b/checks/mds.test index ff07e1a5f..38ca5fbc6 100755 --- a/checks/mds.test +++ b/checks/mds.test @@ -11,7 +11,7 @@ test_one () { failed="" #info Checking message digests -echo -n "" | ./run-gpgm --print-mds >y +echo -n "" | $srcdir/run-gpgm --print-mds >y test_one "MD5" "D41D8CD98F00B204E9800998ECF8427E" test_one "SHA1" "DA39A3EE5E6B4B0D3255BFEF95601890AFD80709" test_one "RMD160" "9C1185A5C5E9FC54612808977EE8F548B2258D31" @@ -19,7 +19,7 @@ test_one "TIGER" "24F0130C63AC933216166E76B1BB925FF373DE2D49584E7A" [ "$failed" != "" ] && error "$failed failed for empty string" -echo -n "abcdefghijklmnopqrstuvwxyz" | ./run-gpgm --print-mds >y +echo -n "abcdefghijklmnopqrstuvwxyz" | $srcdir/run-gpgm --print-mds >y test_one "MD5" "C3FCD3D76192E4007DFB496CCA67E13B" test_one "SHA1" "32D10C7B8CF96570CA04CE37F2A19D84240D3A89" test_one "RMD160" "F71C27109C692C1B56BBDCEB5B9D2865B3708DBC" diff --git a/checks/seat.test b/checks/seat.test index 25fa54a53..f89234e60 100755 --- a/checks/seat.test +++ b/checks/seat.test @@ -3,8 +3,8 @@ . $srcdir/defs.inc || exit 3 for i in $plain_files ; do - echo "$usrpass1" | ./run-gpg --passphrase-fd 0 -seat -r two -o x --yes $i - ./run-gpg -o y --yes x + echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 -seat -r two -o x --yes $i + $srcdir/run-gpg -o y --yes x cmp $i y || error "$i: mismatch" done diff --git a/checks/signencrypt-dsa.test b/checks/signencrypt-dsa.test index eae61ffeb..8b588aa08 100755 --- a/checks/signencrypt-dsa.test +++ b/checks/signencrypt-dsa.test @@ -4,17 +4,17 @@ #info Checking signing and encryption for DSA for i in $plain_files $data_files ; do - ./run-gpg $dsa_keyrings -se -o x --yes \ + $srcdir/run-gpg $dsa_keyrings -se -o x --yes \ -u "$dsa_usrname1" -r "$dsa_usrname2" $i - ./run-gpg $dsa_keyrings -o y --yes x + $srcdir/run-gpg $dsa_keyrings -o y --yes x cmp $i y || error "$i: mismatch" done for da in ripemd160 sha1 md5; do for i in $plain_files; do - ./run-gpg $dsa_keyrings -se -o x --yes --digest-algo $da \ + $srcdir/run-gpg $dsa_keyrings -se -o x --yes --digest-algo $da \ -u "$dsa_usrname1" -r "$dsa_usrname2" $i - ./run-gpg $dsa_keyrings -o y --yes x + $srcdir/run-gpg $dsa_keyrings -o y --yes x cmp $i y || error "$i: mismatch" # process only the first one break diff --git a/checks/signencrypt.test b/checks/signencrypt.test index 5e79b4c88..fa9363f7f 100755 --- a/checks/signencrypt.test +++ b/checks/signencrypt.test @@ -6,8 +6,8 @@ #info Checking signing and encryption for i in $plain_files $data_files ; do echo "$usrpass1" \ - | ./run-gpg --passphrase-fd 0 -se -o x --yes -r "$usrname2" $i - ./run-gpg -o y --yes x + | $srcdir/run-gpg --passphrase-fd 0 -se -o x --yes -r "$usrname2" $i + $srcdir/run-gpg -o y --yes x cmp $i y || error "$i: mismatch" done diff --git a/checks/sigs-dsa.test b/checks/sigs-dsa.test index 8d4bfd556..8f29602dd 100755 --- a/checks/sigs-dsa.test +++ b/checks/sigs-dsa.test @@ -4,16 +4,16 @@ #info Checking DSA signatures (default digest algo) for i in $plain_files $data_files; do - ./run-gpg $dsa_keyrings -s -o x --yes -u $dsa_usrname1 $i - ./run-gpg $dsa_keyrings -o y --yes x + $srcdir/run-gpg $dsa_keyrings -s -o x --yes -u $dsa_usrname1 $i + $srcdir/run-gpg $dsa_keyrings -o y --yes x cmp $i y || error "$i: mismatch" done for da in ripemd160 sha1 md5; do for i in $plain_files; do - ./run-gpg $dsa_keyrings --digest-algo $da \ + $srcdir/run-gpg $dsa_keyrings --digest-algo $da \ -s -o x --yes -u $dsa_usrname1 $i - ./run-gpg $dsa_keyrings -o y --yes x + $srcdir/run-gpg $dsa_keyrings -o y --yes x cmp $i y || error "$i: mismatch" # process only the first one break diff --git a/checks/sigs.test b/checks/sigs.test index 298c9b358..2446dde96 100755 --- a/checks/sigs.test +++ b/checks/sigs.test @@ -4,16 +4,16 @@ #info Checking signatures for i in $plain_files $data_files; do - echo "$usrpass1" | ./run-gpg --passphrase-fd 0 -s -o x --yes $i - ./run-gpg -o y --yes x + echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 -s -o x --yes $i + $srcdir/run-gpg -o y --yes x cmp $i y || error "$i: mismatch" done for da in ripemd160 sha1 md5 tiger; do for i in $plain_files; do - echo "$usrpass1" | ./run-gpg --passphrase-fd 0 --digest-algo $da \ + echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 --digest-algo $da \ -s -o x --yes $i - ./run-gpg -o y --yes x + $srcdir/run-gpg -o y --yes x cmp $i y || error "$i: mismatch" # process only the first one break diff --git a/checks/version.test b/checks/version.test index 55dfe80df..13ca07364 100755 --- a/checks/version.test +++ b/checks/version.test @@ -3,7 +3,7 @@ . $srcdir/defs.inc || exit 3 # print the GPG version -./run-gpg --version +$srcdir/run-gpg --version #fixme: check that the output is correct |