diff --git a/tests/openpgp/armdetach.scm b/tests/openpgp/armdetach.scm index f45844139..3bae28b98 100755 --- a/tests/openpgp/armdetach.scm +++ b/tests/openpgp/armdetach.scm @@ -28,5 +28,5 @@ --output ,tmp ,source ) usrpass1) (pipe:do (pipe:open source (logior O_RDONLY O_BINARY)) - (pipe:spawn `(,@GPG --yes ,tmp))))) + (pipe:spawn `(,@GPG --yes --verify ,tmp -))))) (append plain-files data-files)) diff --git a/tests/openpgp/armdetachm.scm b/tests/openpgp/armdetachm.scm index 8d30fd349..68122630e 100755 --- a/tests/openpgp/armdetachm.scm +++ b/tests/openpgp/armdetachm.scm @@ -33,4 +33,4 @@ (pipe:open file (logior O_RDONLY O_BINARY)) (pipe:splice sink))) files))) - (pipe:spawn `(,@GPG --yes ,tmp)))) + (pipe:spawn `(,@GPG --yes --verify ,tmp -)))) diff --git a/tests/openpgp/armencrypt.scm b/tests/openpgp/armencrypt.scm index b9dfc1e1d..21131eac0 100755 --- a/tests/openpgp/armencrypt.scm +++ b/tests/openpgp/armencrypt.scm @@ -26,6 +26,6 @@ (tr:do (tr:open source) (tr:gpg usrpass1 `(--yes --passphrase-fd "0" -ea --recipient ,usrname2)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) (append plain-files data-files)) diff --git a/tests/openpgp/armencryptp.scm b/tests/openpgp/armencryptp.scm index d28090237..4a001660a 100755 --- a/tests/openpgp/armencryptp.scm +++ b/tests/openpgp/armencryptp.scm @@ -27,6 +27,6 @@ (tr:open source) (tr:pipe-do (pipe:gpg `(--yes -ea --recipient ,usrname2)) - (pipe:gpg '(--yes))) + (pipe:gpg '(--yes --decrypt))) (tr:assert-identity source))) (append plain-files data-files)) diff --git a/tests/openpgp/armor.scm b/tests/openpgp/armor.scm index 7498ba705..6f57c7853 100755 --- a/tests/openpgp/armor.scm +++ b/tests/openpgp/armor.scm @@ -764,4 +764,4 @@ wg7Md81a5RI3F2FG8747t9gX (tr:do (tr:pipe-do (pipe:echo nopad_armored_msg) - (pipe:gpg '()))) + (pipe:gpg '(--decrypt)))) diff --git a/tests/openpgp/armsignencrypt.scm b/tests/openpgp/armsignencrypt.scm index 18178f11e..49eea07cf 100755 --- a/tests/openpgp/armsignencrypt.scm +++ b/tests/openpgp/armsignencrypt.scm @@ -26,6 +26,6 @@ (tr:do (tr:open source) (tr:gpg usrpass1 `(--yes --passphrase-fd "0" -sea --recipient ,usrname2)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) (append plain-files data-files)) diff --git a/tests/openpgp/armsigs.scm b/tests/openpgp/armsigs.scm index 6e5d0566b..2fab729e1 100755 --- a/tests/openpgp/armsigs.scm +++ b/tests/openpgp/armsigs.scm @@ -26,6 +26,6 @@ (tr:do (tr:open source) (tr:gpg usrpass1 `(--yes --passphrase-fd "0" -sa --recipient ,usrname2)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) (append plain-files data-files)) diff --git a/tests/openpgp/clearsig.scm b/tests/openpgp/clearsig.scm index cdbf603fc..a9f20f233 100755 --- a/tests/openpgp/clearsig.scm +++ b/tests/openpgp/clearsig.scm @@ -25,7 +25,7 @@ (lettmp (signed) (call-popen `(,@GPG --output ,signed --yes ,@args ,source) input) - (call-popen `(,@GPG --output ,sink --yes ,signed) "")))) + (call-popen `(,@GPG --output ,sink --yes --verify ,signed) "")))) (for-each-p "Checking signing and verifying plain text messages" diff --git a/tests/openpgp/compression.scm b/tests/openpgp/compression.scm index f39c13212..bab7572c1 100755 --- a/tests/openpgp/compression.scm +++ b/tests/openpgp/compression.scm @@ -30,7 +30,7 @@ (tr:open source) (tr:gpg "" `(--yes --encrypt --recipient ,usrname2 --compress-algo ,compression)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) (append plain-files data-files))) (force all-compression-algos)) diff --git a/tests/openpgp/conventional-mdc.scm b/tests/openpgp/conventional-mdc.scm index 5b009aef0..af27fad07 100755 --- a/tests/openpgp/conventional-mdc.scm +++ b/tests/openpgp/conventional-mdc.scm @@ -34,7 +34,7 @@ (tr:gpg passphrase `(--yes --passphrase-fd "0" ,s2k --force-mdc -c --cipher-algo ,algo)) - (tr:gpg passphrase `(--yes --passphrase-fd "0" ,s2k)) + (tr:gpg passphrase `(--yes --passphrase-fd "0" --decrypt ,s2k)) (tr:assert-identity source))) '("plain-1" "data-80000"))) (force all-cipher-algos)) @@ -45,6 +45,6 @@ (tr:do (tr:open source) (tr:gpg passphrase `(--yes --passphrase-fd "0" ,s2k -cs)) - (tr:gpg passphrase `(--yes --passphrase-fd "0" ,s2k)) + (tr:gpg passphrase `(--yes --passphrase-fd "0" --decrypt ,s2k)) (tr:assert-identity source))) (append plain-files data-files)) diff --git a/tests/openpgp/conventional.scm b/tests/openpgp/conventional.scm index 612b99298..4bca3c92f 100755 --- a/tests/openpgp/conventional.scm +++ b/tests/openpgp/conventional.scm @@ -29,7 +29,7 @@ (tr:do (tr:open source) (tr:gpg passphrase `(--yes --passphrase-fd "0" ,s2k -c)) - (tr:gpg passphrase `(--yes --passphrase-fd "0" ,s2k)) + (tr:gpg passphrase `(--yes --passphrase-fd "0" --decrypt ,s2k)) (tr:assert-identity source))) '("plain-2" "data-32000")) @@ -43,7 +43,7 @@ (tr:open source) (tr:gpg passphrase `(--yes --passphrase-fd "0" ,s2k -c --cipher-algo ,algo)) - (tr:gpg passphrase `(--yes --passphrase-fd "0" ,s2k)) + (tr:gpg passphrase `(--yes --passphrase-fd "0" --decrypt ,s2k)) (tr:assert-identity source))) '("plain-1" "data-80000"))) (force all-cipher-algos)) diff --git a/tests/openpgp/decrypt-dsa.scm b/tests/openpgp/decrypt-dsa.scm index 49f95347c..640dfd23f 100755 --- a/tests/openpgp/decrypt-dsa.scm +++ b/tests/openpgp/decrypt-dsa.scm @@ -25,6 +25,6 @@ (lambda (name) (tr:do (tr:open (in-srcdir (string-append name "-pgp.asc"))) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity name))) (list (car plain-files))) diff --git a/tests/openpgp/decrypt.scm b/tests/openpgp/decrypt.scm index ba8bceee1..8dac38aec 100755 --- a/tests/openpgp/decrypt.scm +++ b/tests/openpgp/decrypt.scm @@ -25,6 +25,6 @@ (lambda (name) (tr:do (tr:open (in-srcdir (string-append name ".asc"))) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity name))) plain-files) diff --git a/tests/openpgp/detach.scm b/tests/openpgp/detach.scm index 2180f78b3..ac2bc361a 100755 --- a/tests/openpgp/detach.scm +++ b/tests/openpgp/detach.scm @@ -28,5 +28,5 @@ --output ,tmp ,source ) usrpass1) (pipe:do (pipe:open source (logior O_RDONLY O_BINARY)) - (pipe:spawn `(,@GPG --yes ,tmp))))) + (pipe:spawn `(,@GPG --yes --verify ,tmp -))))) (append plain-files data-files)) diff --git a/tests/openpgp/detachm.scm b/tests/openpgp/detachm.scm index 1de8da9df..0b6445829 100755 --- a/tests/openpgp/detachm.scm +++ b/tests/openpgp/detachm.scm @@ -33,4 +33,4 @@ (pipe:open file (logior O_RDONLY O_BINARY)) (pipe:splice sink))) files))) - (pipe:spawn `(,@GPG --yes ,tmp)))) + (pipe:spawn `(,@GPG --yes --verify ,tmp -)))) diff --git a/tests/openpgp/ecc.scm b/tests/openpgp/ecc.scm index a40869db4..2ea8c3910 100755 --- a/tests/openpgp/ecc.scm +++ b/tests/openpgp/ecc.scm @@ -101,8 +101,7 @@ Ic1RdzgeCfosMF+l/zVRchcLKzenEQA= (lettmp (x y) (call-with-output-file x (lambda (p) (display (eval test (current-environment)) p))) - (call-check `(,(tool 'gpg) --verify ,x)) - (call-check `(,(tool 'gpg) --output ,y ,x)) + (call-check `(,(tool 'gpg) --output ,y --verify ,x)) (unless (file=? y z) (fail "mismatch")))) '(msg_opaque_signed_256 msg_opaque_signed_384 msg_opaque_signed_521))) @@ -181,7 +180,7 @@ Rg== (lettmp (x y) (call-with-output-file x (lambda (p) (display (eval test (current-environment)) p))) - (call-check `(,@GPG --yes --output ,y ,x)) + (call-check `(,@GPG --yes --output ,y --decrypt ,x)) (unless (file=? y z) (fail "mismatch")))) '(msg_encrypted_256 msg_encrypted_384 msg_encrypted_521))) @@ -200,7 +199,7 @@ Rg== (tr:do (tr:open source) (tr:gpg "" `(--yes --encrypt --recipient ,keyid)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) mainkeyids)) (append plain-files data-files)) @@ -217,7 +216,7 @@ Rg== (tr:do (tr:open source) (tr:gpg "" `(--yes --sign --local-user ,keyid)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) mainkeyids)) (append plain-files data-files)) diff --git a/tests/openpgp/encrypt-dsa.scm b/tests/openpgp/encrypt-dsa.scm index 7ac191645..0c5a2fdcf 100755 --- a/tests/openpgp/encrypt-dsa.scm +++ b/tests/openpgp/encrypt-dsa.scm @@ -26,7 +26,7 @@ (tr:do (tr:open source) (tr:gpg "" `(--yes --encrypt --recipient ,dsa-usrname2)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) (append plain-files data-files)) @@ -40,7 +40,7 @@ (tr:open source) (tr:gpg "" `(--yes --encrypt --recipient ,dsa-usrname2 --cipher-algo ,cipher)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) (append plain-files data-files))) (force all-cipher-algos)) diff --git a/tests/openpgp/encrypt-multifile.scm b/tests/openpgp/encrypt-multifile.scm index 4b76ff0dd..d55971c52 100755 --- a/tests/openpgp/encrypt-multifile.scm +++ b/tests/openpgp/encrypt-multifile.scm @@ -34,6 +34,6 @@ (lambda (source) (tr:do (tr:open (string-append source ".gpg")) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) files) diff --git a/tests/openpgp/encrypt.scm b/tests/openpgp/encrypt.scm index 4247aa875..1888a0034 100755 --- a/tests/openpgp/encrypt.scm +++ b/tests/openpgp/encrypt.scm @@ -26,7 +26,7 @@ (tr:do (tr:open source) (tr:gpg "" `(--yes --encrypt --recipient ,usrname2)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) (append plain-files data-files)) @@ -40,7 +40,7 @@ (tr:open source) (tr:gpg "" `(--yes --encrypt --recipient ,usrname2 --cipher-algo ,cipher)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) (append plain-files data-files))) (force all-cipher-algos)) @@ -56,6 +56,6 @@ (tr:gpg "" `(--yes -v --no-keyring --encrypt --recipient-file ,(in-srcdir key-file1) --hidden-recipient-file ,(in-srcdir key-file2))) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) plain-files) diff --git a/tests/openpgp/encryptp.scm b/tests/openpgp/encryptp.scm index d93919089..ccd5c7ba3 100755 --- a/tests/openpgp/encryptp.scm +++ b/tests/openpgp/encryptp.scm @@ -27,6 +27,6 @@ (tr:open source) (tr:pipe-do (pipe:gpg `(--yes --encrypt --recipient ,usrname2)) - (pipe:gpg '(--yes))) + (pipe:gpg '(--yes --decrypt))) (tr:assert-identity source))) (append plain-files data-files)) diff --git a/tests/openpgp/seat.scm b/tests/openpgp/seat.scm index 22a5a6716..31bd71a3b 100755 --- a/tests/openpgp/seat.scm +++ b/tests/openpgp/seat.scm @@ -26,6 +26,6 @@ (tr:do (tr:open source) (tr:gpg usrpass1 '(--yes -seat -r two@example.com --passphrase-fd "0")) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-weak-identity source))) plain-files) diff --git a/tests/openpgp/signencrypt-dsa.scm b/tests/openpgp/signencrypt-dsa.scm index c969d2fa7..00ce625de 100755 --- a/tests/openpgp/signencrypt-dsa.scm +++ b/tests/openpgp/signencrypt-dsa.scm @@ -28,7 +28,7 @@ (tr:gpg usrpass1 `(--yes --passphrase-fd "0" -se -u ,dsa-usrname1 --recipient ,dsa-usrname2)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) (append plain-files data-files)) @@ -44,6 +44,6 @@ -u ,dsa-usrname1 --recipient ,dsa-usrname2 --digest-algo ,hash)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity (car plain-files)))) algos) diff --git a/tests/openpgp/signencrypt.scm b/tests/openpgp/signencrypt.scm index 35ac89a0f..3021eb43b 100755 --- a/tests/openpgp/signencrypt.scm +++ b/tests/openpgp/signencrypt.scm @@ -26,14 +26,14 @@ (tr:do (tr:open source) (tr:gpg usrpass1 `(--yes --passphrase-fd "0" -se --recipient ,usrname2)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) (append plain-files data-files)) (info "Checking bug 537: MDC problem with old style compressed packets.") (lettmp (tmp) (call-popen `(,@GPG --yes --passphrase-fd "0" - --output ,tmp ,(in-srcdir "bug537-test.data.asc")) + --output ,tmp --decrypt ,(in-srcdir "bug537-test.data.asc")) usrpass1) (if (not (string=? "4336AE2A528FAE091E73E59E325B588FEE795F9B" (cadar (gpg-hash-string `(--print-md SHA1 ,tmp) "")))) diff --git a/tests/openpgp/sigs-dsa.scm b/tests/openpgp/sigs-dsa.scm index f909078ae..d8494d52a 100755 --- a/tests/openpgp/sigs-dsa.scm +++ b/tests/openpgp/sigs-dsa.scm @@ -26,7 +26,7 @@ (tr:do (tr:open source) (tr:gpg "" `(--yes --sign --user ,dsa-usrname1)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) (append plain-files data-files)) @@ -39,6 +39,6 @@ (tr:do (tr:open (car plain-files)) (tr:gpg "" `(--yes --sign --user ,dsa-usrname1 --digest-algo ,hash)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity (car plain-files)))) algos) diff --git a/tests/openpgp/sigs.scm b/tests/openpgp/sigs.scm index 5a1efa76f..c2298f985 100755 --- a/tests/openpgp/sigs.scm +++ b/tests/openpgp/sigs.scm @@ -26,7 +26,7 @@ (tr:do (tr:open source) (tr:gpg "" '(--yes --sign)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity source))) (append plain-files data-files)) @@ -38,7 +38,7 @@ (tr:do (tr:open (car plain-files)) (tr:gpg "" `(--yes --sign --user ,usrname3 --digest-algo ,hash)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity (car plain-files)))) (if (not (equal? "MD5" hash)) ;; Using the DSA sig key - only 160 bit or larger hashes @@ -46,6 +46,6 @@ (tr:open (car plain-files)) (tr:gpg usrpass1 `(--yes --sign --passphrase-fd "0" --digest-algo ,hash)) - (tr:gpg "" '(--yes)) + (tr:gpg "" '(--yes --decrypt)) (tr:assert-identity (car plain-files))))) (force all-hash-algos))