security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/ChangeLog
View File

@ -1,3 +1,12 @@
2003-11-14 David Shaw <dshaw@jabberwocky.com>
* options.h, trustdb.c (trust_model_string, init_trustdb): Add
support for "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.
2003-11-13 David Shaw <dshaw@jabberwocky.com> 2003-11-13 David Shaw <dshaw@jabberwocky.com>
* options.h, g10.c, keyedit.c, keylist.c, mainproc.c: Clarify the * options.h, g10.c, keyedit.c, keylist.c, mainproc.c: Clarify the

7
g10/keyedit.c
View File

@ -1565,6 +1565,13 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
break; break;
case cmdTRUST: case cmdTRUST:
if(opt.trust_model==TM_EXTERNAL)
{
tty_printf(_("Owner trust may not be set while "
"using an user provided trust database\n"));
break;
}
show_key_with_all_names( keyblock, 0, 0, 0, 1, 0 ); show_key_with_all_names( keyblock, 0, 0, 0, 1, 0 );
tty_printf("\n"); tty_printf("\n");
if( edit_ownertrust( find_kbnode( keyblock, if( edit_ownertrust( find_kbnode( keyblock,

5
g10/options.h
View File

@ -91,7 +91,10 @@ struct {
int compress_sigs; int compress_sigs;
/* TM_CLASSIC must be zero to accomodate trustdbs generated before /* TM_CLASSIC must be zero to accomodate trustdbs generated before
we started storing the trust model inside the trustdb. */ we started storing the trust model inside the trustdb. */
enum {TM_CLASSIC=0, TM_PGP=1, TM_ALWAYS, TM_AUTO} trust_model; enum
{
TM_CLASSIC=0, TM_PGP=1, TM_EXTERNAL=2, TM_ALWAYS, TM_AUTO
} trust_model;
unsigned int force_ownertrust; unsigned int force_ownertrust;
enum enum
{ {

17
g10/trustdb.c
View File

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