[svn] GnuPG - r3924 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2005-11-06 05:32:54 +0100 (Sun, 06 Nov 2005)
New Revision: 3924

Modified:
   trunk/g10/ChangeLog
   trunk/g10/Makefile.am
   trunk/g10/apdu.c
   trunk/g10/gpg.c
Log:
* Makefile.am: Include @LIBUSB_CPPFLAGS@ in our CPPFLAGS.  Strictly
speaking this should be only in gpg_CPPFLAGS, but then we have to
compile everything twice for gpg and gpgv.

* apdu.c (open_pcsc_reader): Fix double free.

* gpg.c (main) [__APPLE__]: Default the PCSC driver to the OS X
location.  Suggested by Patty A. Hardy.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2005-11-06 04:25:52 UTC (rev 3923)
+++ trunk/g10/ChangeLog	2005-11-06 04:32:54 UTC (rev 3924)
@@ -1,3 +1,14 @@
+2005-11-05  David Shaw  <dshaw at jabberwocky.com>
+
+	* Makefile.am: Include @LIBUSB_CPPFLAGS@ in our CPPFLAGS.
+	Strictly speaking this should be only in gpg_CPPFLAGS, but then we
+	have to compile everything twice for gpg and gpgv.
+
+	* apdu.c (open_pcsc_reader): Fix double free.
+
+	* gpg.c (main) [__APPLE__]: Default the PCSC driver to the OS X
+	location.  Suggested by Patty A. Hardy.
+
 2005-11-02  David Shaw  <dshaw at jabberwocky.com>
 
 	* trustdb.c (clean_sigs_from_uid): Include sigs from unavailable

Modified: trunk/g10/Makefile.am
===================================================================
--- trunk/g10/Makefile.am	2005-11-06 04:25:52 UTC (rev 3923)
+++ trunk/g10/Makefile.am	2005-11-06 04:32:54 UTC (rev 3924)
@@ -19,14 +19,16 @@
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/intl @LIBUSB_CPPFLAGS@
+
 EXTRA_DIST = options.skel
 # it seems that we can't use this with automake 1.5
 #OMIT_DEPENDENCIES = zlib.h zconf.h
 
 if ! HAVE_DOSISH_SYSTEM
-AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\""
+AM_CPPFLAGS += -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\""
 endif
+
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
 other_libs = $(LIBICONV) $(SRVLIBS) $(LIBINTL) $(CAPLIBS)
 

Modified: trunk/g10/apdu.c
===================================================================
--- trunk/g10/apdu.c	2005-11-06 04:25:52 UTC (rev 3923)
+++ trunk/g10/apdu.c	2005-11-06 04:32:54 UTC (rev 3924)
@@ -1603,7 +1603,6 @@
       xfree (reader_table[slot].rdrname);
       reader_table[slot].rdrname = NULL;
       reader_table[slot].used = 0;
-      xfree (list);
       return -1 /*pcsc_error_to_sw (err)*/;
     }
 

Modified: trunk/g10/gpg.c
===================================================================
--- trunk/g10/gpg.c	2005-11-06 04:25:52 UTC (rev 3923)
+++ trunk/g10/gpg.c	2005-11-06 04:32:54 UTC (rev 3924)
@@ -1711,7 +1711,9 @@
 
 #ifdef ENABLE_CARD_SUPPORT
 #if defined(_WIN32) || defined(__CYGWIN__)
-    opt.pcsc_driver = "winscard.dll"; 
+    opt.pcsc_driver = "winscard.dll";
+#elif defined(__APPLE__)
+    opt.pcsc_driver = "/System/Library/Frameworks/PCSC.framework/PCSC";
 #else
     opt.pcsc_driver = "libpcsclite.so"; 
 #endif