security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

2009-10-16 Marcus Brinkmann <marcus@g10code.com>

Browse Source 
* configure.ac: Check for libassuan instead of libassuan-pth.

common/
2009-10-16  Marcus Brinkmann  <marcus@g10code.com>

	* Makefile.am (libcommon_a_CFLAGS): Use LIBASSUAN_CFLAGS instead
	of LIBASSUAN_PTH_CFLAGS.

scd/
2009-10-16  Marcus Brinkmann  <marcus@g10code.com>

	* AM_CFLAGS, scdaemon_LDADD: Use libassuan instead of libassuan-pth.
	* scdaemon.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
	(main): Call assuan_set_system_hooks and assuan_sock_init.

g13/
2009-10-16  Marcus Brinkmann  <marcus@g10code.com>

	* AM_CFLAGS, g13_LDADD: Use libassuan instead of libassuan-pth.
	* g13.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
	(main): Call assuan_set_system_hooks.

agent/
2009-10-16  Marcus Brinkmann  <marcus@g10code.com>

	* gpg_agent_CFLAGS, gpg_agent_LDADD: Use libassuan instead of
	libassuan-pth.
	* gpg-agent.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
	(main): Call assuan_set_system_hooks and assuan_sock_init.
	Fix invocation of assuan_socket_connect.
This commit is contained in:
Marcus Brinkmann 2009-10-16 18:35:03 +00:00
parent c2f6439011
commit de563fdeb5
13 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* configure.ac: Check for libassuan instead of libassuan-pth.
2009-10-12 Werner Koch <wk@g10code.com> 2009-10-12 Werner Koch <wk@g10code.com>
* configure.ac: Use -O3 because newer gcc versions require that * configure.ac: Use -O3 because newer gcc versions require that

8
agent/ChangeLog
View File

@ -1,3 +1,11 @@
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* gpg_agent_CFLAGS, gpg_agent_LDADD: Use libassuan instead of
libassuan-pth.
* gpg-agent.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks and assuan_sock_init.
Fix invocation of assuan_socket_connect.
2009-09-23 Werner Koch <wk@g10code.com> 2009-09-23 Werner Koch <wk@g10code.com>
* command.c (register_commands) [HAVE_ASSUAN_SET_IO_MONITOR]: * command.c (register_commands) [HAVE_ASSUAN_SET_IO_MONITOR]:

4
agent/Makefile.am
View File

@ -62,9 +62,9 @@ gpg_agent_res_deps =
#endif #endif
gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS) gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
gpg_agent_LDADD = $(commonpth_libs) \ gpg_agent_LDADD = $(commonpth_libs) \
$(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \ $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \
$(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
gpg_agent_LDFLAGS = $(gpg_agent_res_ldflags) gpg_agent_LDFLAGS = $(gpg_agent_res_ldflags)
gpg_agent_DEPENDENCIES = $(gpg_agent_res_deps) gpg_agent_DEPENDENCIES = $(gpg_agent_res_deps)

7
agent/gpg-agent.c
View File

@ -50,7 +50,6 @@
#include "gc-opt-flags.h" #include "gc-opt-flags.h"
#include "exechelp.h" #include "exechelp.h"
enum cmd_and_opt_values enum cmd_and_opt_values
{ aNull = 0, { aNull = 0,
oCsh = 'c', oCsh = 'c',
@ -276,6 +275,8 @@ static void check_own_socket (void);
static int check_for_running_agent (int silent, int mode); static int check_for_running_agent (int silent, int mode);
/* Pth wrapper function definitions. */ /* Pth wrapper function definitions. */
ASSUAN_SYSTEM_PTH_IMPL;
GCRY_THREAD_OPTION_PTH_IMPL; GCRY_THREAD_OPTION_PTH_IMPL;
static int fixed_gcry_pth_init (void) static int fixed_gcry_pth_init (void)
{ {
@ -593,6 +594,8 @@ main (int argc, char **argv )
assuan_set_malloc_hooks (&malloc_hooks); assuan_set_malloc_hooks (&malloc_hooks);
assuan_set_assuan_log_prefix (log_get_prefix (NULL)); assuan_set_assuan_log_prefix (log_get_prefix (NULL));
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
assuan_set_system_hooks (ASSUAN_SYSTEM_PTH);
assuan_sock_init ();
setup_libgcrypt_logging (); setup_libgcrypt_logging ();
gcry_control (GCRYCTL_USE_SECURE_RNDPOOL); gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
@ -2217,7 +2220,7 @@ check_for_running_agent (int silent, int mode)
rc = assuan_new (&ctx); rc = assuan_new (&ctx);
if (! rc) if (! rc)
rc = assuan_socket_connect (&ctx, infostr, pid); rc = assuan_socket_connect (ctx, infostr, pid);
xfree (infostr); xfree (infostr);
if (rc) if (rc)
{ {

5
common/ChangeLog
View File

@ -1,3 +1,8 @@
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* Makefile.am (libcommon_a_CFLAGS): Use LIBASSUAN_CFLAGS instead
of LIBASSUAN_PTH_CFLAGS.
2009-10-13 Werner Koch <wk@g10code.com> 2009-10-13 Werner Koch <wk@g10code.com>
* exechelp.c (gnupg_kill_process): New. * exechelp.c (gnupg_kill_process): New.

2
common/Makefile.am
View File

@ -87,7 +87,7 @@ libcommonpth_a_SOURCES = $(common_sources)
if USE_DNS_SRV if USE_DNS_SRV
libcommonpth_a_SOURCES += srv.c libcommonpth_a_SOURCES += srv.c
endif endif
libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS) libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
libsimple_pwquery_a_SOURCES = \ libsimple_pwquery_a_SOURCES = \
simple-pwquery.c simple-pwquery.h asshelp.c asshelp.h simple-pwquery.c simple-pwquery.h asshelp.c asshelp.h

6
configure.ac
View File

@ -612,8 +612,8 @@ AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
have_libassuan=yes,have_libassuan=no) have_libassuan=yes,have_libassuan=no)
if test "$have_libassuan" = "yes"; then if test "$have_libassuan" = "yes"; then
have_libassuan=no have_libassuan=no
AM_PATH_LIBASSUAN_PTH("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION", AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
have_libassuan=yes,have_libassuan=no) have_libassuan=yes,have_libassuan=no)
AC_DEFINE_UNQUOTED(GNUPG_LIBASSUAN_VERSION, "$libassuan_version", AC_DEFINE_UNQUOTED(GNUPG_LIBASSUAN_VERSION, "$libassuan_version",
[version of the libassuan library]) [version of the libassuan library])
fi fi
@ -1384,7 +1384,7 @@ if test "$have_libassuan" = "no"; then
die=yes die=yes
AC_MSG_NOTICE([[ AC_MSG_NOTICE([[
*** ***
*** You need libassuan with Pth support to build this program. *** You need libassuan to build this program.
*** This library is for example available at *** This library is for example available at
*** ftp://ftp.gnupg.org/gcrypt/libassuan/ *** ftp://ftp.gnupg.org/gcrypt/libassuan/
*** (at least version $NEED_LIBASSUAN_VERSION (API $NEED_LIBASSUAN_API) is required). *** (at least version $NEED_LIBASSUAN_VERSION (API $NEED_LIBASSUAN_API) is required).

6
g13/ChangeLog
View File

@ -1,3 +1,9 @@
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* AM_CFLAGS, g13_LDADD: Use libassuan instead of libassuan-pth.
* g13.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks.
2009-10-16 Marcus Brinkmann <marcus@g10code.com> 2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* Makefile.am (AM_CFLAGS): Add $(KSBA_CFLAGS). * Makefile.am (AM_CFLAGS): Add $(KSBA_CFLAGS).

4
g13/Makefile.am
View File

@ -25,7 +25,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
include $(top_srcdir)/am/cmacros.am include $(top_srcdir)/am/cmacros.am
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) \ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) \
$(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
g13_SOURCES = \ g13_SOURCES = \
g13.c g13.h \ g13.c g13.h \
@ -42,6 +42,6 @@ g13_SOURCES = \
be-truecrypt.c be-truecrypt.h be-truecrypt.c be-truecrypt.h
g13_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \ g13_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \
$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \
$(GPG_ERROR_LIBS) $(LIBINTL) $(GPG_ERROR_LIBS) $(LIBINTL)

3
g13/g13.c
View File

@ -204,6 +204,8 @@ static void join_idle_task (void);
/* Begin Pth wrapper functions. */ /* Begin Pth wrapper functions. */
ASSUAN_SYSTEM_PTH_IMPL;
GCRY_THREAD_OPTION_PTH_IMPL; GCRY_THREAD_OPTION_PTH_IMPL;
static int fixed_gcry_pth_init (void) static int fixed_gcry_pth_init (void)
{ {
@ -441,6 +443,7 @@ main ( int argc, char **argv)
/* Prepare libassuan. */ /* Prepare libassuan. */
assuan_set_assuan_log_prefix (log_get_prefix (NULL)); assuan_set_assuan_log_prefix (log_get_prefix (NULL));
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
assuan_set_system_hooks (ASSUAN_SYSTEM_PTH);
/* Setup a default control structure for command line mode. */ /* Setup a default control structure for command line mode. */

6
scd/ChangeLog
View File

@ -1,3 +1,9 @@
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* AM_CFLAGS, scdaemon_LDADD: Use libassuan instead of libassuan-pth.
* scdaemon.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks and assuan_sock_init.
2009-09-23 Marcus Brinkmann <marcus@g10code.de> 2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of * command.c: Include "scdaemon.h" before <assuan.h> because of

6
scd/Makefile.am
View File

@ -27,7 +27,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
include $(top_srcdir)/am/cmacros.am include $(top_srcdir)/am/cmacros.am
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) \ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) \
$(KSBA_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
card_apps = app-openpgp.c app-nks.c app-dinsig.c app-p15.c app-geldkarte.c card_apps = app-openpgp.c app-nks.c app-dinsig.c app-p15.c app-geldkarte.c
@ -42,7 +42,7 @@ scdaemon_SOURCES = \
scdaemon_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \ scdaemon_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \
$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \
$(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \ $(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \
$(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV)
@ -60,7 +60,7 @@ scdaemon_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \
#sc_copykeys_LDADD = \ #sc_copykeys_LDADD = \
# ../jnlib/libjnlib.a ../common/libcommon.a \ # ../jnlib/libjnlib.a ../common/libcommon.a \
# ../common/libsimple-pwquery.a \ # ../common/libsimple-pwquery.a \
# $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \ # $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \
# $(LIBUSB_LIBS) \ # $(LIBUSB_LIBS) \
# -lgpg-error @LIBINTL@ @DL_LIBS@ # -lgpg-error @LIBINTL@ @DL_LIBS@
# #

5
scd/scdaemon.c
View File

@ -53,7 +53,6 @@
#include "mkdtemp.h" #include "mkdtemp.h"
#include "gc-opt-flags.h" #include "gc-opt-flags.h"
enum cmd_and_opt_values enum cmd_and_opt_values
{ aNull = 0, { aNull = 0,
oCsh = 'c', oCsh = 'c',
@ -204,6 +203,8 @@ static void *start_connection_thread (void *arg);
static void handle_connections (int listen_fd); static void handle_connections (int listen_fd);
/* Pth wrapper function definitions. */ /* Pth wrapper function definitions. */
ASSUAN_SYSTEM_PTH_IMPL;
GCRY_THREAD_OPTION_PTH_IMPL; GCRY_THREAD_OPTION_PTH_IMPL;
static int fixed_gcry_pth_init (void) static int fixed_gcry_pth_init (void)
{ {
@ -410,6 +411,8 @@ main (int argc, char **argv )
assuan_set_malloc_hooks (&malloc_hooks); assuan_set_malloc_hooks (&malloc_hooks);
assuan_set_assuan_log_prefix (log_get_prefix (NULL)); assuan_set_assuan_log_prefix (log_get_prefix (NULL));
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
assuan_set_system_hooks (ASSUAN_SYSTEM_PTH);
assuan_sock_init ();
setup_libgcrypt_logging (); setup_libgcrypt_logging ();
gcry_control (GCRYCTL_USE_SECURE_RNDPOOL); gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);