security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

doc/ 

* gpg.texi (GPG Esoteric Options): No card reader options for gpg2. 
scd/
	* scdaemon.c (DEFAULT_PCSC_DRIVER): Add a default for OS X.
This commit is contained in:
Werner Koch 2007-02-18 13:48:03 +00:00
parent 5240d014f8
commit fedae25efd
5 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -10,7 +10,7 @@ Noteworthy changes in version 2.0.2 (2007-01-31)
* Using a PIN pad does now also work for the signing key. * 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. short. New option --min-passphrase-len defaults to 8.
* The status code BEGIN_SIGNING now shows the used hash algorithms. * The status code BEGIN_SIGNING now shows the used hash algorithms.

4
doc/ChangeLog
View File

@ -1,3 +1,7 @@
2007-02-18 Werner Koch <wk@g10code.com>
* gpg.texi (GPG Esoteric Options): No card reader options for gpg2.
2007-02-14 Werner Koch <wk@g10code.com> 2007-02-14 Werner Koch <wk@g10code.com>
* gpg-agent.texi (Agent Options): Doc --pinentry-touch-file. * gpg-agent.texi (Agent Options): Doc --pinentry-touch-file.

8
doc/gpg.texi
View File

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

4
scd/ChangeLog
View File

@ -1,3 +1,7 @@
2007-02-18 Werner Koch <wk@g10code.com>
* scdaemon.c (DEFAULT_PCSC_DRIVER): Add a default for OS X.
2007-01-25 Werner Koch <wk@g10code.com> 2007-01-25 Werner Koch <wk@g10code.com>
* Makefile.am (scdaemon_LDADD): Added LIBICONV. Noted by Billy * Makefile.am (scdaemon_LDADD): Added LIBICONV. Noted by Billy

4
scd/scdaemon.c
View File

@ -139,9 +139,11 @@ static ARGPARSE_OPTS opts[] = {
}; };
/* 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__) #if defined(HAVE_W32_SYSTEM) || defined(__CYGWIN__)
#define DEFAULT_PCSC_DRIVER "winscard.dll" #define DEFAULT_PCSC_DRIVER "winscard.dll"
#elif defined(__APPLE__)
#define DEFAULT_PCSC_DRIVER "/System/Library/Frameworks/PCSC.framework/PCSC"
#elif defined(__GLIBC__) #elif defined(__GLIBC__)
#define DEFAULT_PCSC_DRIVER "libpcsclite.so.1" #define DEFAULT_PCSC_DRIVER "libpcsclite.so.1"
#else #else