security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

* trustdb.c (validate_keys): Never schedule a nextcheck into the

Browse Source 
past.
This commit is contained in:
Werner Koch 2002-04-18 11:01:56 +00:00
parent bf7cef8ebf
commit 37c268ed6a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/ChangeLog
View File

@ -1,5 +1,8 @@
2002-04-18 Werner Koch <wk@gnupg.org> 2002-04-18 Werner Koch <wk@gnupg.org>
* trustdb.c (validate_keys): Never schedule a nextcheck into the
past.
* getkey.c (premerge_public_with_secret): Fixed 0x12345678! syntax * getkey.c (premerge_public_with_secret): Fixed 0x12345678! syntax
for use with secret keys. for use with secret keys.
(lookup): Advance the searchmode after a search FIRST. (lookup): Advance the searchmode after a search FIRST.

11
g10/trustdb.c
View File

@ -1338,8 +1338,9 @@ validate_keys (int interactive)
int key_count; int key_count;
int ot_unknown, ot_undefined, ot_never, ot_marginal, ot_full, ot_ultimate; int ot_unknown, ot_undefined, ot_never, ot_marginal, ot_full, ot_ultimate;
KeyHashTable visited; KeyHashTable visited;
u32 next_expire; u32 start_time, next_expire;
start_time = make_timestamp ();
next_expire = 0xffffffff; /* set next expire to the year 2106 */ next_expire = 0xffffffff; /* set next expire to the year 2106 */
visited = new_key_hash_table (); visited = new_key_hash_table ();
/* Fixme: Instead of always building a UTK list, we could just build it /* Fixme: Instead of always building a UTK list, we could just build it
@ -1480,7 +1481,11 @@ validate_keys (int interactive)
release_key_hash_table (visited); release_key_hash_table (visited);
if (!rc && !quit) /* mark trustDB as checked */ if (!rc && !quit) /* mark trustDB as checked */
{ {
if (next_expire == 0xffffffff) /* If there was an inconsistency in the trustdb it might happen
that the next_expire is set to the past; however at this point
we did checked it and thus we can flag the trustdb with no
schedule required. */
if (next_expire == 0xffffffff || next_expire < start_time )
tdbio_write_nextcheck (0); tdbio_write_nextcheck (0);
else else
{ {
@ -1492,3 +1497,5 @@ validate_keys (int interactive)
} }
return rc; return rc;
} }