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

Collected changes

Browse source
This commit is contained in:
Werner Koch 2010-05-03 11:10:49 +00:00
parent 1dfd0e0eda
commit 830af45ca2
10 changed files with 129 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

9
agent/ChangeLog
View file

@ -1,3 +1,12 @@
2010-05-03 Werner Koch <wk@g10code.com>
* gpg-agent.c (check_own_socket_thread): Do not release SOCKNAME
too early.
2010-03-17 Werner Koch <wk@g10code.com>
* call-scd.c (unlock_scd): Send a BYE under certain conditions.
2010-02-19 Werner Koch <wk@g10code.com>
* call-pinentry.c (start_pinentry): Remove a translation prefix.

11
agent/call-scd.c
View file

@ -176,6 +176,17 @@ agent_scd_dump_state (void)
static int
unlock_scd (ctrl_t ctrl, int rc)
{
if (gpg_err_code (rc) == GPG_ERR_NOT_OPERATIONAL
&& gpg_err_source (rc) == GPG_ERR_SOURCE_SCD)
{
/* If the SCdaemon returned this error, it detected a major
problem, like no reader connected. To finish this we need to
stop the connection. This simulates an explicit killing of
the SCdaemon. */
assuan_transact (primary_scd_ctx, "BYE",
NULL, NULL, NULL, NULL, NULL, NULL);
}
if (ctrl->scd_local->locked != 1)
{
log_error ("unlock_scd: invalid lock count (%d)\n",

2
agent/gpg-agent.c
View file

@ -2101,7 +2101,6 @@ check_own_socket_thread (void *arg)
check_own_socket_running++;
rc = assuan_new (&ctx);
xfree (sockname);
if (rc)
{
log_error ("can't allocate assuan context: %s\n", gpg_strerror (rc));
@ -2137,6 +2136,7 @@ check_own_socket_thread (void *arg)
xfree (buffer);
leave:
xfree (sockname);
if (ctx)
assuan_release (ctx);
if (rc)