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, trustdb.c (trust_model_string, init_trustdb): Add support for

Browse source 
"external" trust model, where the user can provide a pregenerated trustdb.

* keyedit.c (keyedit_menu): Do not allow editing ownertrust with an
external trust model trustdb.
This commit is contained in:
David Shaw 2003-11-15 00:19:49 +00:00
parent 80caf9957f
commit c47ec46526
4 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
g10/trustdb.c
View file

@ -1,6 +1,6 @@
/* trustdb.c
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
* Free Software Foundation, Inc.
* Copyright (C) 1998, 1999, 2000, 2001, 2002
* 2003 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@ -388,10 +388,11 @@ trust_model_string(void)
{
switch(opt.trust_model)
{
case TM_PGP: return "PGP";
case TM_CLASSIC: return "classic";
case TM_ALWAYS: return "always";
default: return "unknown";
case TM_CLASSIC: return "classic";
case TM_PGP: return "PGP";
case TM_EXTERNAL: return "external";
case TM_ALWAYS: return "always";
default: return "unknown";
}
}
@ -438,7 +439,9 @@ init_trustdb()
opt.trust_model=tdbio_read_model();
/* Sanity check this ;) */
if(opt.trust_model!=TM_CLASSIC && opt.trust_model!=TM_PGP)
if(opt.trust_model!=TM_CLASSIC
&& opt.trust_model!=TM_PGP
&& opt.trust_model!=TM_EXTERNAL)
{
log_info(_("unable to use unknown trust model (%d) - "
"assuming %s trust model\n"),opt.trust_model,"PGP");