[svn] GnuPG - r4435 - in trunk: . doc scd

[svn author wk]

Author: wk
Date: 2007-02-18 14:48:03 +0100 (Sun, 18 Feb 2007)
New Revision: 4435

Modified:
   trunk/NEWS
   trunk/doc/ChangeLog
   trunk/doc/gpg.texi
   trunk/scd/ChangeLog
   trunk/scd/scdaemon.c
Log:
doc/
	* gpg.texi (GPG Esoteric Options): No card reader options for gpg2. 
scd/
	* scdaemon.c (DEFAULT_PCSC_DRIVER): Add a default for OS X.


Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2007-02-14 16:27:55 UTC (rev 4434)
+++ trunk/NEWS	2007-02-18 13:48:03 UTC (rev 4435)
@@ -10,7 +10,7 @@
 
  * Using a PIN pad does now also work for the signing key.
 
- * A warning is displayed bu gpg-agent if a new passphrase is too
+ * A warning is displayed by gpg-agent if a new passphrase is too
    short.  New option --min-passphrase-len defaults to 8.
 
  * The status code BEGIN_SIGNING now shows the used hash algorithms.

Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2007-02-14 16:27:55 UTC (rev 4434)
+++ trunk/doc/ChangeLog	2007-02-18 13:48:03 UTC (rev 4435)
@@ -1,3 +1,7 @@
+2007-02-18  Werner Koch  <wk at g10code.com>
+
+	* gpg.texi (GPG Esoteric Options): No card reader options for gpg2. 
+
 2007-02-14  Werner Koch  <wk at g10code.com>
 
 	* gpg-agent.texi (Agent Options): Doc --pinentry-touch-file.

Modified: trunk/doc/gpg.texi
===================================================================
--- trunk/doc/gpg.texi	2007-02-14 16:27:55 UTC (rev 4434)
+++ trunk/doc/gpg.texi	2007-02-18 13:48:03 UTC (rev 4435)
@@ -1076,18 +1076,23 @@
 @include opt-homedir.texi
 
 
+ at ifset gpgone
 @item --pcsc-driver @code{file}
 Use @code{file} to access the smartcard reader. The current default is
 `libpcsclite.so.1' for GLIBC based systems,
 `/System/Library/Frameworks/PCSC.framework/PCSC' for MAC OS X,
 `winscard.dll' for Windows and `libpcsclite.so' for other systems.
+ at end ifset
 
+ at ifset gpgone
 @item --disable-ccid
 Disable the integrated support for CCID compliant readers. This
 allows to fall back to one of the other drivers even if the internal
 CCID driver can handle the reader. Note, that CCID support is only
 available if libusb was available at build time.
+ at end ifset
 
+ at ifset gpgone
 @item --reader-port @code{number_or_string}
 This option may be used to specify the port of the card terminal. A
 value of 0 refers to the first serial device; add 32768 to access USB
@@ -1095,6 +1100,7 @@
 readers might need a string here; run the program in verbose mode to get
 a list of available readers. The default is then the first reader
 found.
+ at end ifset
 
 @item --display-charset @code{name}
 Set the name of the native character set. This is used to convert
@@ -2451,10 +2457,12 @@
 keyring a given key resides on. This option is deprecated: use
 @option{--list-options [no-]show-keyring} instead.
 
+ at ifset gpgone
 @item --ctapi-driver @code{file}
 Use @code{file} to access the smartcard reader. The current default
 is `libtowitoko.so'. Note that the use of this interface is
 deprecated; it may be removed in future releases.
+ at end ifset
 
 @item --always-trust
 Identical to @option{--trust-model always}. This option is deprecated.

Modified: trunk/scd/ChangeLog
===================================================================
--- trunk/scd/ChangeLog	2007-02-14 16:27:55 UTC (rev 4434)
+++ trunk/scd/ChangeLog	2007-02-18 13:48:03 UTC (rev 4435)
@@ -1,3 +1,7 @@
+2007-02-18  Werner Koch  <wk at g10code.com>
+
+	* scdaemon.c (DEFAULT_PCSC_DRIVER): Add a default for OS X.
+
 2007-01-25  Werner Koch  <wk at g10code.com>
 
 	* Makefile.am (scdaemon_LDADD): Added LIBICONV.  Noted by Billy

Modified: trunk/scd/scdaemon.c
===================================================================
--- trunk/scd/scdaemon.c	2007-02-14 16:27:55 UTC (rev 4434)
+++ trunk/scd/scdaemon.c	2007-02-18 13:48:03 UTC (rev 4435)
@@ -139,9 +139,11 @@
 };
 
 
-/* The card dirver we use by default for PC/SC.  */
+/* The card driver we use by default for PC/SC.  */
 #if defined(HAVE_W32_SYSTEM) || defined(__CYGWIN__)
 #define DEFAULT_PCSC_DRIVER "winscard.dll"
+#elif defined(__APPLE__)
+#define DEFAULT_PCSC_DRIVER "/System/Library/Frameworks/PCSC.framework/PCSC"
 #elif defined(__GLIBC__)
 #define DEFAULT_PCSC_DRIVER "libpcsclite.so.1"
 #else