diff options
| author | Werner Koch <wk@gnupg.org> | 2018-05-30 22:05:57 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2018-05-30 22:05:57 +0200 |
| commit | d3d41146b33040eb65eaaaffcfc7b4211e60bd95 (patch) | |
| tree | 7436c1f92cf1c990c1ac25f6fd9faf353dc78754 /g10/mainproc.c | |
| parent | gpg: Detect multiple literal plaintext packets more reliable. (diff) | |
| download | gnupg2-d3d41146b33040eb65eaaaffcfc7b4211e60bd95.tar.xz gnupg2-d3d41146b33040eb65eaaaffcfc7b4211e60bd95.zip | |
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 <wk@gnupg.org>
Diffstat (limited to 'g10/mainproc.c')
| -rw-r--r-- | g10/mainproc.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index 0341589b5..0303a527d 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -899,12 +899,9 @@ proc_plaintext( CTX c, PACKET *pkt ) { log_info (_("WARNING: multiple plaintexts seen\n")); - if (!opt.flags.allow_multiple_messages) - { - write_status_text (STATUS_ERROR, "proc_pkt.plaintext 89_BAD_DATA"); - log_inc_errorcount (); - rc = gpg_error (GPG_ERR_UNEXPECTED); - } + write_status_text (STATUS_ERROR, "proc_pkt.plaintext 89_BAD_DATA"); + log_inc_errorcount (); + rc = gpg_error (GPG_ERR_UNEXPECTED); } if (!rc) @@ -1871,14 +1868,12 @@ check_sig_and_print (CTX c, kbnode_t node) goto ambiguous; /* If we wanted to disallow multiple sig verification, we'd do - something like this: - - if (n && !opt.allow_multisig_verification) - goto ambiguous; - - However, now that we have --allow-multiple-messages, this - can stay allowable as we can't get here unless multiple - messages (i.e. multiple literals) are allowed. */ + * something like this: + * + * if (n) + * goto ambiguous; + * + * However, this can stay allowable as we can't get here. */ if (n_onepass != n_sig) { |