security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-03 22:48:03 +02:00
Code Activity

scd: Do not use the pcsc-wrapper.

Browse Source 
* scd/apdu.c (NEED_PCSC_WRAPPER): Do not define.
* scd/Makefile.am (libexec_PROGRAMS): Remove gnupg-pcsc-wrapper
(gnupg_pcsc_wrapper_SOURCES): Remove.
(gnupg_pcsc_wrapper_LDADD): Remove.
(gnupg_pcsc_wrapper_CFLAGS): Remove.
This commit is contained in:
Werner Koch 2014-07-22 16:16:33 +02:00
parent 5b34e347b6
commit bc6b452129
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scd/Makefile.am
View File

@ -19,11 +19,7 @@
EXTRA_DIST = ChangeLog-2011 scdaemon-w32info.rc EXTRA_DIST = ChangeLog-2011 scdaemon-w32info.rc
if HAVE_W32_SYSTEM
libexec_PROGRAMS = scdaemon libexec_PROGRAMS = scdaemon
else
libexec_PROGRAMS = scdaemon gnupg-pcsc-wrapper
endif
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
@ -72,6 +68,3 @@ scdaemon_LDADD = $(libcommonpth) ../gl/libgnu.a \
# $(LIBUSB_LIBS) \ # $(LIBUSB_LIBS) \
# -lgpg-error @LIBINTL@ @DL_LIBS@ # -lgpg-error @LIBINTL@ @DL_LIBS@
# #
gnupg_pcsc_wrapper_SOURCES = pcsc-wrapper.c
gnupg_pcsc_wrapper_LDADD = $(DL_LIBS)
gnupg_pcsc_wrapper_CFLAGS =

5
scd/apdu.c
View File

@ -66,8 +66,9 @@
#include "ccid-driver.h" #include "ccid-driver.h"
/* Due to conflicting use of threading libraries we usually can't link /* Due to conflicting use of threading libraries we usually can't link
against libpcsclite. Instead we use a wrapper program. */ against libpcsclite if we are using Pth. Instead we use a wrapper
#ifdef USE_NPTH program. Note that with nPth there is no need for a wrapper. */
#ifdef USE_PTH /* Right, plain old Pth. */
#if !defined(HAVE_W32_SYSTEM) && !defined(__CYGWIN__) #if !defined(HAVE_W32_SYSTEM) && !defined(__CYGWIN__)
#define NEED_PCSC_WRAPPER 1 #define NEED_PCSC_WRAPPER 1
#endif #endif

3
scd/pcsc-wrapper.c
View File

@ -20,7 +20,8 @@
/* /*
This wrapper is required to handle problems with the libpscslite This wrapper is required to handle problems with the libpscslite
library. That library assumes that pthreads are used and fails library. That library assumes that pthreads are used and fails
badly if one tries to use it with a procerss using Pth. badly if one tries to use it with a process using Pth. Note that
the wrapper is not required if nPth is used.
The operation model is pretty simple: It reads requests from stdin The operation model is pretty simple: It reads requests from stdin
and returns the answer on stdout. There is no direct mapping to the and returns the answer on stdout. There is no direct mapping to the