mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* options.h, g10.c (main): Add --trust-model option. Current models are
"openpgp" which is classic+trustsigs, "classic" which is classic only, and "always" which is the same as the current option --always-trust (which still works). Default is "openpgp". * trustdb.c (validate_one_keyblock): Use "openpgp" trust model to enable trust sigs. * gpgv.c (main), mainproc.c (check_sig_and_print), pkclist.c (do_we_trust, do_we_trust_pre, check_signatures_trust): Use new --trust-model option in place of --always-trust.
This commit is contained in:
parent
1b593c0515
commit
91a8e4a6fb
7 changed files with 45 additions and 16 deletions
|
@ -1382,7 +1382,7 @@ check_sig_and_print( CTX c, KBNODE node )
|
|||
}
|
||||
}
|
||||
|
||||
if (opt.always_trust || !un)
|
||||
if (opt.trust_model==TM_ALWAYS || !un)
|
||||
keyid_str[17] = 0; /* cut off the "[uncertain]" part */
|
||||
|
||||
write_status_text_and_buffer (statno, keyid_str,
|
||||
|
@ -1393,7 +1393,7 @@ check_sig_and_print( CTX c, KBNODE node )
|
|||
log_info(rc? _("BAD signature from \"")
|
||||
: sig->flags.expired ? _("Expired signature from \"")
|
||||
: _("Good signature from \""));
|
||||
if (!opt.always_trust && un) {
|
||||
if (opt.trust_model!=TM_ALWAYS && un) {
|
||||
fputs(_("[uncertain]"), log_stream() );
|
||||
putc(' ', log_stream() );
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue