diff options
Diffstat (limited to '')
| -rw-r--r-- | checks/ChangeLog | 6 | ||||
| -rwxr-xr-x | checks/verify.test | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/checks/ChangeLog b/checks/ChangeLog index 790d4b691..cc67e7eaf 100644 --- a/checks/ChangeLog +++ b/checks/ChangeLog @@ -1,3 +1,9 @@ +2007-03-04 David Shaw <[email protected]> + + * verify.test: Use --allow-multiple-messages instead of + --allow-multisig-verification. Two clearsigs in a row counts as a + multiple-message test. + 2006-12-11 Werner Koch <[email protected]> * verify.test (msg_clsclss_asc): Work around a bug in OpenBSD. diff --git a/checks/verify.test b/checks/verify.test index 4f53b9707..3f534d99d 100755 --- a/checks/verify.test +++ b/checks/verify.test @@ -121,8 +121,8 @@ IHBlb3BsZS4K # Two standard signed messages in a row -tests="$tests msg_olsols_asc_multisig" -msg_olsols_asc_multisig='-----BEGIN PGP MESSAGE----- +tests="$tests msg_olsols_asc_multiple" +msg_olsols_asc_multiple='-----BEGIN PGP MESSAGE----- kA0DAAIRLXJ8x2hpdzQBrQEHYgNtc2dEDFJaSSB0aGluayB0aGF0IGFsbCByaWdo dC10aGlua2luZyBwZW9wbGUgaW4gdGhpcyBjb3VudHJ5IGFyZSBzaWNrIGFuZAp0 @@ -215,8 +215,8 @@ EOF ` # Two clear text signatures in a row -tests="$tests msg_clsclss_asc" -msg_clsclss_asc="${msg_cls_asc} +tests="$tests msg_clsclss_asc_multiple" +msg_clsclss_asc_multiple="${msg_cls_asc} ${msg_clss_asc}" @@ -236,8 +236,8 @@ for i in $tests ; do msg_*_asc) $GPG --verify x || error "verify of $i failed" ;; - msg_*_asc_multisig) - $GPG --verify --allow-multisig-verification x \ + msg_*_asc_multiple) + $GPG --verify --allow-multiple-messages x \ || error "verify of $i failed" set +x $GPG --verify x && error "verify of $i succeeded but should not" |