security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

Made the KILLAGENT and KILLSCD commands working again.

Browse Source 
This requires that GnuPG is build with a newer version of Libassuan
(2.0.3).
This commit is contained in:
Werner Koch 2011-08-10 11:47:04 +02:00
parent 14e0b60efd
commit 81389383a3
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -7,6 +7,8 @@ Noteworthy changes in version 2.1.0beta3
* Support the SSH confirm flag. * Support the SSH confirm flag.
* The Assuan commands KILLAGENT and KILLSCD are working again.
Noteworthy changes in version 2.1.0beta2 (2011-03-08) Noteworthy changes in version 2.1.0beta2 (2011-03-08)
----------------------------------------------------- -----------------------------------------------------

5
agent/command.c
View File

@ -2259,7 +2259,12 @@ cmd_killagent (assuan_context_t ctx, char *line)
return set_error (GPG_ERR_NOT_SUPPORTED, "no --use-standard-socket"); return set_error (GPG_ERR_NOT_SUPPORTED, "no --use-standard-socket");
ctrl->server_local->stopme = 1; ctrl->server_local->stopme = 1;
#ifdef ASSUAN_FORCE_CLOSE
assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
return 0;
#else
return gpg_error (GPG_ERR_EOF); return gpg_error (GPG_ERR_EOF);
#endif
} }

5
scd/ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-10 Werner Koch <wk@g10code.com>
* command.c (cmd_killscd): Use the new assuan force close flag
if available.
2011-08-08 Werner Koch <wk@g10code.com> 2011-08-08 Werner Koch <wk@g10code.com>
* app-openpgp.c (do_decipher): Take care of accidentally passed * app-openpgp.c (do_decipher): Take care of accidentally passed

8
scd/command.c
View File

@ -1862,7 +1862,15 @@ cmd_killscd (assuan_context_t ctx, char *line)
(void)line; (void)line;
ctrl->server_local->stopme = 1; ctrl->server_local->stopme = 1;
#ifdef ASSUAN_FORCE_CLOSE
assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
return 0;
#else
/* Actually returning an EOF does not anymore work with modern
Libassuan versions. However we keep that non working code until
we make a Libassuan with the force close flag a requirement. */
return gpg_error (GPG_ERR_EOF); return gpg_error (GPG_ERR_EOF);
#endif
} }