diff options
| author | Werner Koch <wk@gnupg.org> | 2007-03-05 15:56:31 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2007-03-05 15:56:31 +0100 |
| commit | 9491ab44c58ca9853a1990d4039846e53bd2d8a1 (patch) | |
| tree | 68b28ec298c307bc7af9c832a684e739cf86ec5e /tests | |
| parent | Add new SVN only file README.maint (diff) | |
| download | gnupg2-9491ab44c58ca9853a1990d4039846e53bd2d8a1.tar.xz gnupg2-9491ab44c58ca9853a1990d4039846e53bd2d8a1.zip | |
Ported multiple-messages protection.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/openpgp/ChangeLog | 6 | ||||
| -rwxr-xr-x | tests/openpgp/verify.test | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/tests/openpgp/ChangeLog b/tests/openpgp/ChangeLog index 5518b6cd1..c4179d474 100644 --- a/tests/openpgp/ChangeLog +++ b/tests/openpgp/ChangeLog @@ -1,3 +1,9 @@ +2007-03-04 David Shaw <dshaw@jabberwocky.com> (wk) + + * verify.test: Use --allow-multiple-messages instead of + --allow-multisig-verification. Two clearsigs in a row counds as a + multiple-message test. + 2006-11-16 Werner Koch <wk@g10code.com> * Makefile.am (plain-large): Use gpg.texi instead of FAQ which diff --git a/tests/openpgp/verify.test b/tests/openpgp/verify.test index e6a61fc1b..41bd94a3f 100755 --- a/tests/openpgp/verify.test +++ b/tests/openpgp/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}" @@ -233,8 +233,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" $GPG --verify x && error "verify of $i succeeded but should not" ;; |