security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Merge branch 'STABLE-BRANCH-2-2' into wk-master

Browse source
This commit is contained in:
Werner Koch 2018-03-06 16:26:26 +01:00
commit f574aabeeb
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
10 changed files with 93 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
agent/agent.h
View file

@ -451,6 +451,7 @@ int agent_clear_passphrase (ctrl_t ctrl,
/*-- cache.c --*/
void initialize_module_cache (void);
void deinitialize_module_cache (void);
void agent_cache_housekeeping (void);
void agent_flush_cache (void);
int agent_put_cache (const char *key, cache_mode_t cache_mode,
const char *data, int ttl);

20
agent/cache.c
View file

@ -258,6 +258,26 @@ housekeeping (void)
}
void
agent_cache_housekeeping (void)
{
int res;
if (DBG_CACHE)
log_debug ("agent_cache_housekeeping\n");
res = npth_mutex_lock (&cache_lock);
if (res)
log_fatal ("failed to acquire cache mutex: %s\n", strerror (res));
housekeeping ();
res = npth_mutex_unlock (&cache_lock);
if (res)
log_fatal ("failed to release cache mutex: %s\n", strerror (res));
}
void
agent_flush_cache (void)
{

3
agent/gpg-agent.c
View file

@ -2398,6 +2398,9 @@ handle_tick (void)
}
#endif
/* Need to check for expired cache entries. */
agent_cache_housekeeping ();
/* Check whether the homedir is still available. */
if (!shutdown_pending
&& (!have_homedir_inotify || !reliable_homedir_inotify)