diff options
| -rw-r--r-- | checks/ChangeLog | 5 | ||||
| -rwxr-xr-x | checks/clearsig.test | 4 | ||||
| -rwxr-xr-x | checks/sigs.test | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/checks/ChangeLog b/checks/ChangeLog index 63b7e05a4..2aabd8678 100644 --- a/checks/ChangeLog +++ b/checks/ChangeLog @@ -1,3 +1,8 @@ +2004-02-09 David Shaw <[email protected]> + + * clearsig.test, sigs.test: Properly detect RSA being missing, and + use the proper key for doing an RSA test. + 2003-12-31 David Shaw <[email protected]> * clearsig.test, conventional-mdc.test, conventional.test, diff --git a/checks/clearsig.test b/checks/clearsig.test index b1eb125f2..8217f2f49 100755 --- a/checks/clearsig.test +++ b/checks/clearsig.test @@ -19,9 +19,9 @@ done # and once more to check rfc1991 # ====================================== -if have_cipher_algo "RSA"; then +if have_pubkey_algo "RSA"; then for i in $plain_files plain-large ; do - $GPG -u $usrkeyid3 --rfc1991 --digest-algo md5 -sat -o x --yes $i + $GPG -u $usrname3 --rfc1991 --digest-algo md5 -sat -o x --yes $i $GPG --verify x done fi diff --git a/checks/sigs.test b/checks/sigs.test index a0ae955dd..63f606759 100755 --- a/checks/sigs.test +++ b/checks/sigs.test @@ -24,7 +24,7 @@ done # TODO: add the new SHAs here once we allow them to be used in new # documents. -if have_cipher_algo "RSA"; then +if have_pubkey_algo "RSA"; then # Using the RSA sig key - all hashes hash_algo_list="ripemd160 sha1 md5" if have_hash_algo "SHA256"; then @@ -33,7 +33,7 @@ if have_cipher_algo "RSA"; then for da in $hash_algo_list ; do for i in $plain_files; do - $GPG -u $usrkeyid3 --digest-algo $da -s -o x --yes $i + $GPG -u $usrname3 --digest-algo $da -s -o x --yes $i $GPG -o y --yes x cmp $i y || error "$i: mismatch" # process only the first one |