security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-11 22:01:08 +02:00
Code Activity

kbx: Fix regression in compression trigger from July 18

Browse Source 
* kbx/keybox-update.c (keybox_compress): Change condition back.
Also use make_timestamp for CUT_TIME.
--

Fixes-commit: 824ca6f042dc69edaf67bf9d4e875be75babab00
Note that the original change was not backported to 2.2.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2019-08-23 15:12:13 +02:00
parent d058d80ed0
commit 30aaa4ba00
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kbx/keybox-update.c
View File

@ -675,7 +675,7 @@ keybox_compress (KEYBOX_HANDLE hd)
{ {
u32 last_maint = buf32_to_u32 (buffer+20); u32 last_maint = buf32_to_u32 (buffer+20);
if ( (last_maint + 3*3600) < make_timestamp () ) if ( (last_maint + 3*3600) > make_timestamp () )
{ {
fclose (fp); fclose (fp);
_keybox_release_blob (blob); _keybox_release_blob (blob);
@ -700,7 +700,7 @@ keybox_compress (KEYBOX_HANDLE hd)
automagically skip any blobs flagged as deleted. Thus what we automagically skip any blobs flagged as deleted. Thus what we
only have to do is to check all ephemeral flagged blocks whether only have to do is to check all ephemeral flagged blocks whether
their time has come and write out all other blobs. */ their time has come and write out all other blobs. */
cut_time = time(NULL) - 86400; cut_time = make_timestamp () - 86400;
first_blob = 1; first_blob = 1;
skipped_deleted = 0; skipped_deleted = 0;
for (rc=0; !(read_rc = _keybox_read_blob (&blob, fp, &skipped_deleted)); for (rc=0; !(read_rc = _keybox_read_blob (&blob, fp, &skipped_deleted));