diff options
| author | David Shaw <dshaw@jabberwocky.com> | 2002-08-23 22:59:48 +0200 |
|---|---|---|
| committer | David Shaw <dshaw@jabberwocky.com> | 2002-08-23 22:59:48 +0200 |
| commit | 7e3e9bf357793aad8d604c9c32b1bb25c19b98bf (patch) | |
| tree | 26d3a22e89978ba1e2dc25d73c451e3defe7afde /g10/getkey.c | |
| parent | * faq.raw: Updated. New Maintainer is David D. Scribner. (diff) | |
| download | gnupg2-7e3e9bf357793aad8d604c9c32b1bb25c19b98bf.tar.xz gnupg2-7e3e9bf357793aad8d604c9c32b1bb25c19b98bf.zip | |
* sig-check.c (do_check, do_check_messages): Emit the usual sig warnings
even for cached sigs. This also serves to protect against missing a sig
expiring while cached.
* getkey.c (merge_selfsigs_main): Don't check UID self-sigs twice.
Diffstat (limited to 'g10/getkey.c')
| -rw-r--r-- | g10/getkey.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 43db3abcb..c62a99709 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -1241,7 +1241,7 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked ) signode = NULL; sigdate = 0; /* helper to find the latest signature */ - for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY; k = k->next ) { + for(k=keyblock; k && k->pkt->pkttype != PKT_USER_ID; k = k->next ) { if ( k->pkt->pkttype == PKT_SIGNATURE ) { PKT_signature *sig = k->pkt->pkt.signature; if ( sig->keyid[0] == kid[0] && sig->keyid[1]==kid[1] ) { @@ -1534,6 +1534,7 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked ) pk->has_expired = key_expire >= curtime? 0 : key_expire; pk->expiredate = key_expire; + /* Fixme: we should see how to get rid of the expiretime fields but * this needs changes at other places too. */ |