mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* keygen.c (do_add_key_flags): Don't set the certify flag for subkeys.
(ask_algo): Provide key flags for DSA, Elgamal_e, and Elgamal subkeys. (generate_keypair): Provide key flags for the default DSA/Elgamal keys. * sig-check.c (signature_check, signature_check2, check_key_signature, check_key_signature2): Allow passing NULLs for unused parameters in the x2 form of each function to avoid the need for dummy variables. getkey.c, mainproc.c: Change all callers. * trustdb.h, trustdb.c (read_trust_options): New. Returns items from the trustdb version record. * keylist.c (public_key_list): Use it here for the new "tru" record. * gpgv.c (read_trust_options): Stub.
This commit is contained in:
parent
fa0cc6602b
commit
fbdee01db9
9 changed files with 129 additions and 29 deletions
|
@ -590,7 +590,30 @@ trustdb_pending_check(void)
|
|||
return pending_check_trustdb;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
read_trust_options(byte *trust_model,ulong *created,ulong *nextcheck,
|
||||
byte *marginals,byte *completes,byte *cert_depth)
|
||||
{
|
||||
TRUSTREC opts;
|
||||
|
||||
init_trustdb();
|
||||
|
||||
read_record(0,&opts,RECTYPE_VER);
|
||||
|
||||
if(trust_model)
|
||||
*trust_model=opts.r.ver.trust_model;
|
||||
if(created)
|
||||
*created=opts.r.ver.created;
|
||||
if(nextcheck)
|
||||
*nextcheck=opts.r.ver.nextcheck;
|
||||
if(marginals)
|
||||
*marginals=opts.r.ver.marginals;
|
||||
if(completes)
|
||||
*completes=opts.r.ver.completes;
|
||||
if(cert_depth)
|
||||
*cert_depth=opts.r.ver.cert_depth;
|
||||
}
|
||||
|
||||
/***********************************************
|
||||
*********** Ownertrust et al. ****************
|
||||
***********************************************/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue