security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* g10.c (main): Add --no-textmode.

Browse source 
* export.c (do_export_stream), keyedit.c (show_key_with_all_names,
menu_addrevoker), mainproc.c (check_sig_and_print), photoid.c
(show_photos), sign.c (mk_notation_and_policy), trustdb.c (get_validity,
reset_trust_records, validate_keys): Make some strings translatable.

* mainproc.c (check_sig_and_print): Show digest algorithm and sig class
when verifying a sig with --verbose on, and add version, pk and hash
algorithms and sig class to VALIDSIG.

* parse-packet.c (enum_sig_subpkt): Make a warning message a --verbose
warning message since we don't need to warn every time we see an unknown
critical (we only need to invalidate the signature).

* trustdb.c (init_trustdb): Check the trustdb options even with TM_AUTO
since the auto may become TM_CLASSIC or TM_OPENPGP.
This commit is contained in:
David Shaw 2003-04-27 20:22:09 +00:00
parent a01bda6abd
commit 9f6fa94486
8 changed files with 70 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
g10/trustdb.c
View file

@ -440,8 +440,9 @@ init_trustdb()
{
/* Try and set the trust model off of whatever the trustdb says
it is. */
opt.trust_model=tdbio_read_model();
/* Sanity check this ;) */
if(opt.trust_model!=TM_CLASSIC && opt.trust_model!=TM_OPENPGP)
{
log_info(_("unable to use unknown trust model (%d) - "
@ -452,8 +453,9 @@ init_trustdb()
if(opt.verbose)
log_info(_("using %s trust model\n"),trust_model_string());
}
else if(!tdbio_db_matches_options()
&& (opt.trust_model==TM_CLASSIC || opt.trust_model==TM_OPENPGP))
if((opt.trust_model==TM_CLASSIC || opt.trust_model==TM_OPENPGP)
&& !tdbio_db_matches_options())
pending_check_trustdb=1;
}
@ -997,7 +999,7 @@ get_validity (PKT_public_key *pk, PKT_user_id *uid)
if (opt.no_auto_check_trustdb)
{
pending_check_trustdb = 1;
log_info ("please do a --check-trustdb\n");
log_info (_("please do a --check-trustdb\n"));
}
else
{
@ -1808,7 +1810,7 @@ reset_trust_records (KEYDB_HANDLE hd, KeyHashTable exclude)
log_error ("keydb_search_next failed: %s\n", g10_errstr(rc));
}
if (opt.verbose)
log_info ("%d keys processed (%d validity counts cleared)\n",
log_info (_("%d keys processed (%d validity counts cleared)\n"),
count, nreset);
}
@ -1862,7 +1864,7 @@ validate_keys (int interactive)
* here when needed */
if (!utk_list)
{
log_info ("no ultimately trusted keys found\n");
log_info (_("no ultimately trusted keys found\n"));
goto leave;
}