From d3d41146b33040eb65eaaaffcfc7b4211e60bd95 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 30 May 2018 22:05:57 +0200 Subject: gpg: Ignore the multiple message override options. * g10/gpg.c (oAllowMultisigVerification) (oAllowMultipleMessages, oNoAllowMultipleMessages): Remove. (opts): Turn --allow-multisig-verification, --allow-multiple-messages and --no-allow-multiple-messages into NOPs * g10/options.h (struct opt): Remove flags.allow_multiple_messages. * g10/mainproc.c (proc_plaintext): Assume allow_multiple_messages is false. -- These options are very old compatibility hacks and should not be used anymore. We keep them as dummy options in case someone has them in the conf file. Signed-off-by: Werner Koch --- tests/openpgp/verify.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/openpgp/verify.scm b/tests/openpgp/verify.scm index b4dd49b76..afa6b6a21 100755 --- a/tests/openpgp/verify.scm +++ b/tests/openpgp/verify.scm @@ -51,16 +51,12 @@ '(msg_ols_asc msg_cols_asc msg_sl_asc msg_oolss_asc msg_cls_asc msg_clss_asc)) (for-each-p - "Checking that a valid signature over multiple messages is verified as such" + "Checking that a valid signature over multiple messages is rejected" (lambda (armored-file) - (pipe:do - (pipe:echo (eval armored-file (current-environment))) - (pipe:spawn `(,@GPG --verify --allow-multiple-messages))) (catch '() - (pipe:do - (pipe:defer (lambda (sink) - (display armored-file (fdopen sink "w")))) - (pipe:spawn `(,@GPG --verify))) + (pipe:do + (pipe:echo (eval armored-file (current-environment))) + (pipe:spawn `(,@GPG --verify))) (fail "verification succeeded but should not"))) '(msg_olsols_asc_multiple msg_clsclss_asc_multiple)) -- cgit v1.2.3