summaryrefslogtreecommitdiffstats
path: root/kbx
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2019-07-18 13:59:52 +0200
committerWerner Koch <wk@gnupg.org>2019-07-18 13:59:52 +0200
commit824ca6f042dc69edaf67bf9d4e875be75babab00 (patch)
treef77a4d9963b28a9ef3eb8cd786205d09bb165d9f /kbx
parentgpg: More check for symmetric key encryption. (diff)
downloadgnupg2-824ca6f042dc69edaf67bf9d4e875be75babab00.tar.xz
gnupg2-824ca6f042dc69edaf67bf9d4e875be75babab00.zip
kbx: Allow "gpgsm --faked-system-time" to kick off a compression run.
* kbx/keybox-update.c (keybox_compress): Use make_timestamp. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'kbx')
-rw-r--r--kbx/keybox-blob.c2
-rw-r--r--kbx/keybox-update.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kbx/keybox-blob.c b/kbx/keybox-blob.c
index 8ac67afbe..7e4dcfaaa 100644
--- a/kbx/keybox-blob.c
+++ b/kbx/keybox-blob.c
@@ -1102,7 +1102,7 @@ _keybox_update_header_blob (KEYBOXBLOB blob, int for_openpgp)
{
u32 val = make_timestamp ();
- /* Update the last maintenance run times tamp. */
+ /* Update the last maintenance run timestamp. */
blob->blob[20] = (val >> 24);
blob->blob[20+1] = (val >> 16);
blob->blob[20+2] = (val >> 8);
diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c
index e09fefc41..66430c848 100644
--- a/kbx/keybox-update.c
+++ b/kbx/keybox-update.c
@@ -675,7 +675,7 @@ keybox_compress (KEYBOX_HANDLE hd)
{
u32 last_maint = buf32_to_u32 (buffer+20);
- if ( (last_maint + 3*3600) > time (NULL) )
+ if ( (last_maint + 3*3600) < make_timestamp () )
{
fclose (fp);
_keybox_release_blob (blob);