mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-10 21:38:50 +01:00
d8f0b83e4f
* g10/tdbio.c (tdbio_set_dbname): Add arg R_NOFILE.
* g10/trustdb.c (trustdb_args): Add field no_trustdb.
(init_trustdb): Set that field.
(revalidation_mark): Take care of a nonexistent trustdb file.
(read_trust_options): Ditto.
(tdb_get_ownertrust): Ditto.
(tdb_get_min_ownertrust): Ditto.
(tdb_update_ownertrust): Ditto.
(update_min_ownertrust): Ditto.
(tdb_clear_ownertrusts): Ditto.
(tdb_cache_disabled_value): Ditto.
(tdb_check_trustdb_stale): Ditto.
(tdb_get_validity_core): Ditto.
* g10/gpg.c (main): Do not create a trustdb with most commands for
trust-model always.
--
This slightly changes the semantics of most commands in that they
won't create a trustdb if --trust-model=always is used. It just does
not make sense to create a trustdb if there is no need for it.
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit 1a0eeaacd1)
Resolved conflicts:
NEWS
g10/trustdb.c: Manually apply changes due to changed
function names.
Note that this also includes the fix for clear_ownertrust, see
GnuPG-bug-id: 1622.
119 lines
3.4 KiB
C
119 lines
3.4 KiB
C
/* tdbio.h - Trust database I/O functions
|
|
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2012 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef G10_TDBIO_H
|
|
#define G10_TDBIO_H
|
|
|
|
#include "host2net.h"
|
|
|
|
#define TRUST_RECORD_LEN 40
|
|
#define SIGS_PER_RECORD ((TRUST_RECORD_LEN-10)/5)
|
|
#define ITEMS_PER_HTBL_RECORD ((TRUST_RECORD_LEN-2)/4)
|
|
#define ITEMS_PER_HLST_RECORD ((TRUST_RECORD_LEN-6)/5)
|
|
#define ITEMS_PER_PREF_RECORD (TRUST_RECORD_LEN-10)
|
|
#if ITEMS_PER_PREF_RECORD % 2
|
|
#error ITEMS_PER_PREF_RECORD must be even
|
|
#endif
|
|
#define MAX_LIST_SIGS_DEPTH 20
|
|
|
|
|
|
#define RECTYPE_VER 1
|
|
#define RECTYPE_HTBL 10
|
|
#define RECTYPE_HLST 11
|
|
#define RECTYPE_TRUST 12
|
|
#define RECTYPE_VALID 13
|
|
#define RECTYPE_FREE 254
|
|
|
|
|
|
struct trust_record {
|
|
int rectype;
|
|
int mark;
|
|
int dirty; /* for now only used internal by functions */
|
|
struct trust_record *next; /* help pointer to build lists in memory */
|
|
ulong recnum;
|
|
union {
|
|
struct { /* version record: */
|
|
byte version; /* should be 3 */
|
|
byte marginals;
|
|
byte completes;
|
|
byte cert_depth;
|
|
byte trust_model;
|
|
byte min_cert_level;
|
|
ulong created; /* timestamp of trustdb creation */
|
|
ulong nextcheck; /* timestamp of next scheduled check */
|
|
ulong reserved;
|
|
ulong reserved2;
|
|
ulong firstfree;
|
|
ulong reserved3;
|
|
ulong trusthashtbl;
|
|
} ver;
|
|
struct { /* free record */
|
|
ulong next;
|
|
} free;
|
|
struct {
|
|
ulong item[ITEMS_PER_HTBL_RECORD];
|
|
} htbl;
|
|
struct {
|
|
ulong next;
|
|
ulong rnum[ITEMS_PER_HLST_RECORD]; /* of another record */
|
|
} hlst;
|
|
struct {
|
|
byte fingerprint[20];
|
|
byte ownertrust;
|
|
byte depth;
|
|
ulong validlist;
|
|
byte min_ownertrust;
|
|
} trust;
|
|
struct {
|
|
byte namehash[20];
|
|
ulong next;
|
|
byte validity;
|
|
byte full_count;
|
|
byte marginal_count;
|
|
} valid;
|
|
} r;
|
|
};
|
|
typedef struct trust_record TRUSTREC;
|
|
|
|
/*-- tdbio.c --*/
|
|
int tdbio_update_version_record(void);
|
|
int tdbio_set_dbname( const char *new_dbname, int create, int *r_nofile);
|
|
const char *tdbio_get_dbname(void);
|
|
void tdbio_dump_record( TRUSTREC *rec, FILE *fp );
|
|
int tdbio_read_record( ulong recnum, TRUSTREC *rec, int expected );
|
|
int tdbio_write_record( TRUSTREC *rec );
|
|
int tdbio_db_matches_options(void);
|
|
byte tdbio_read_model(void);
|
|
ulong tdbio_read_nextcheck (void);
|
|
int tdbio_write_nextcheck (ulong stamp);
|
|
int tdbio_is_dirty(void);
|
|
int tdbio_sync(void);
|
|
int tdbio_begin_transaction(void);
|
|
int tdbio_end_transaction(void);
|
|
int tdbio_cancel_transaction(void);
|
|
int tdbio_delete_record( ulong recnum );
|
|
ulong tdbio_new_recnum(void);
|
|
int tdbio_search_trust_byfpr(const byte *fingerprint, TRUSTREC *rec );
|
|
int tdbio_search_trust_bypk(PKT_public_key *pk, TRUSTREC *rec );
|
|
|
|
void tdbio_how_to_fix (void);
|
|
void tdbio_invalid(void);
|
|
|
|
#endif /*G10_TDBIO_H*/
|