diff options
| author | Werner Koch <[email protected]> | 2006-10-10 11:11:04 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2006-10-10 11:11:04 +0000 |
| commit | 2e8481c03bceef8d009ea30b40c3e1674cfc9e93 (patch) | |
| tree | 03469588ff8e79f7c2cc28300cc133c9e89c69d1 /scd | |
| parent | Make it also work for the card. (diff) | |
| download | gnupg-2e8481c03bceef8d009ea30b40c3e1674cfc9e93.tar.gz gnupg-2e8481c03bceef8d009ea30b40c3e1674cfc9e93.zip | |
Various changes
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/ChangeLog | 7 | ||||
| -rw-r--r-- | scd/Makefile.am | 6 | ||||
| -rw-r--r-- | scd/app-p15.c | 2 | ||||
| -rw-r--r-- | scd/scdaemon.h | 3 |
4 files changed, 13 insertions, 5 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog index 7bb5c97b1..9f6a0f5c5 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,10 @@ +2006-10-06 Werner Koch <[email protected]> + + * 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 <[email protected]> * command.c (update_reader_status_file): Increase buffer of diff --git a/scd/Makefile.am b/scd/Makefile.am index 61c0c05d9..63356dba8 100644 --- a/scd/Makefile.am +++ b/scd/Makefile.am @@ -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@ # diff --git a/scd/app-p15.c b/scd/app-p15.c index 21dbad47a..8e786dd97 100644 --- a/scd/app-p15.c +++ b/scd/app-p15.c @@ -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. */ diff --git a/scd/scdaemon.h b/scd/scdaemon.h index 6e81c0d20..40a398856 100644 --- a/scd/scdaemon.h +++ b/scd/scdaemon.h @@ -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); |