mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Various changes
This commit is contained in:
parent
4d770bedc1
commit
2e8481c03b
56 changed files with 527 additions and 337 deletions
|
@ -1,3 +1,10 @@
|
|||
2006-10-06 Werner Koch <wk@g10code.com>
|
||||
|
||||
* Makefile.am (AM_CFLAGS): Use PTH version of libassuan.
|
||||
(scdaemon_LDADD): Ditto.
|
||||
|
||||
* scdaemon.h (send_status_info): Mark with sentinel attribute.
|
||||
|
||||
2006-10-02 Marcus Brinkmann <marcus@g10code.de>
|
||||
|
||||
* command.c (update_reader_status_file): Increase buffer of
|
||||
|
|
|
@ -29,7 +29,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
|
|||
include $(top_srcdir)/am/cmacros.am
|
||||
|
||||
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) \
|
||||
$(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
|
||||
$(KSBA_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
|
||||
|
||||
|
||||
card_apps = app-openpgp.c app-nks.c app-dinsig.c app-p15.c
|
||||
|
@ -45,7 +45,7 @@ scdaemon_SOURCES = \
|
|||
|
||||
|
||||
scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
|
||||
$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) \
|
||||
$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
|
||||
$(LIBUSB_LIBS) -lgpg-error $(LIBINTL) $(DL_LIBS) $(NETLIBS)
|
||||
|
||||
# Removed for now: We need to decide whether it makes sense to
|
||||
|
@ -63,7 +63,7 @@ scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
|
|||
#sc_copykeys_LDADD = \
|
||||
# ../jnlib/libjnlib.a ../common/libcommon.a \
|
||||
# ../common/libsimple-pwquery.a \
|
||||
# $(LIBGCRYPT_LIBS) $(PTH_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
|
||||
# $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
|
||||
# $(LIBUSB_LIBS) \
|
||||
# -lgpg-error @LIBINTL@ @DL_LIBS@
|
||||
#
|
||||
|
|
|
@ -3187,7 +3187,7 @@ do_sign (app_t app, const char *keyidstr, int hashalgo,
|
|||
|
||||
/* Handler for the PKAUTH command.
|
||||
|
||||
This is basically the same as the PKSIGN command but we firstcheck
|
||||
This is basically the same as the PKSIGN command but we first check
|
||||
that the requested key is suitable for authentication; that is, it
|
||||
must match the criteria used for the attribute $AUTHKEYID. See
|
||||
do_sign for calling conventions; there is no HASHALGO, though. */
|
||||
|
|
|
@ -110,7 +110,8 @@ const char *scd_get_socket_name (void);
|
|||
|
||||
/*-- command.c --*/
|
||||
void scd_command_handler (int);
|
||||
void send_status_info (ctrl_t ctrl, const char *keyword, ...);
|
||||
void send_status_info (ctrl_t ctrl, const char *keyword, ...)
|
||||
GNUPG_GCC_A_SENTINEL(1);
|
||||
void scd_update_reader_status_file (void);
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue