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

Require Libassuan 2.0.3

Browse Source 
* configure.ac: Require Libassuan 2.0.3.
* agent/call-scd.c (ASSUAN_CONVEY_COMMENTS): Remove macro replacement.
* agent/command.c (cmd_killagent) [ASSUAN_FORCE_CLOSE]: Remove
dependency.
(cmd_killagent) [ASSUAN_FORCE_CLOSE]: Ditto.
* scd/command.c (cmd_killscd) [ASSUAN_FORCE_CLOSE]: Ditto.
This commit is contained in:
Werner Koch 2011-12-20 11:12:21 +01:00
parent 07f20f313a
commit 366512abe4
4 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
agent/call-scd.c
View File

@ -45,15 +45,6 @@
#define MAX_OPEN_FDS 20 #define MAX_OPEN_FDS 20
#endif #endif
/* This Assuan flag is only available since libassuan 2.0.2. Because
comments lines are comments anyway we can use a replacement which
might not do anything. assuan_{g,s}et_flag don't return an error
thus there won't be any ABI problem. */
#ifndef ASSUAN_CONVEY_COMMENTS
#define ASSUAN_CONVEY_COMMENTS 4
#endif
/* Definition of module local data of the CTRL structure. */ /* Definition of module local data of the CTRL structure. */
struct scd_local_s struct scd_local_s
{ {

4
agent/command.c
View File

@ -2310,12 +2310,8 @@ 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); assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
return 0; return 0;
#else
return gpg_error (GPG_ERR_EOF);
#endif
} }

2
configure.ac
View File

@ -46,7 +46,7 @@ NEED_LIBGCRYPT_API=1
NEED_LIBGCRYPT_VERSION=1.5.0 NEED_LIBGCRYPT_VERSION=1.5.0
NEED_LIBASSUAN_API=2 NEED_LIBASSUAN_API=2
NEED_LIBASSUAN_VERSION=2.0.0 NEED_LIBASSUAN_VERSION=2.0.3
NEED_KSBA_API=1 NEED_KSBA_API=1
NEED_KSBA_VERSION=1.2.0 NEED_KSBA_VERSION=1.2.0

7
scd/command.c
View File

@ -1936,15 +1936,8 @@ 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); assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
return 0; 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);
#endif
} }