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

* options.h, g10.c (main): Add --trust-model option. Current models are

Browse source 
"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:
David Shaw 2002-11-03 20:18:56 +00:00
parent 1b593c0515
commit 91a8e4a6fb
7 changed files with 45 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
g10/pkclist.c
View file

@ -475,9 +475,9 @@ do_we_trust( PKT_public_key *pk, unsigned int *trustlevel )
}
*trustlevel &= ~trustmask;
if( opt.always_trust) {
if( opt.trust_model==TM_ALWAYS ) {
if( opt.verbose )
log_info("No trust check due to --always-trust option\n");
log_info("No trust check due to --trust-model always option\n");
return 1;
}
@ -570,7 +570,7 @@ do_we_trust_pre( PKT_public_key *pk, unsigned int trustlevel )
* his decision the next time he encrypts for this recipient?
*/
}
else if( opt.always_trust && !rc ) {
else if( opt.trust_model==TM_ALWAYS && !rc ) {
if( !opt.quiet )
log_info(_("WARNING: Using untrusted key!\n"));
rc = 1;
@ -591,7 +591,7 @@ check_signatures_trust( PKT_signature *sig )
unsigned int trustlevel;
int rc=0;
if ( opt.always_trust)
if ( opt.trust_model==TM_ALWAYS )
{
if( !opt.quiet )
log_info(_("WARNING: Using untrusted key!\n"));