[svn] GnuPG - r4923 - in trunk: . doc po scd tools
svn author wk
cvs at cvs.gnupg.org
Wed Jan 28 15:18:44 CET 2009
Author: wk
Date: 2009-01-28 15:18:40 +0100 (Wed, 28 Jan 2009)
New Revision: 4923
Modified:
trunk/NEWS
trunk/doc/scdaemon.texi
trunk/po/be.po
trunk/po/ca.po
trunk/po/cs.po
trunk/po/da.po
trunk/po/de.po
trunk/po/el.po
trunk/po/eo.po
trunk/po/es.po
trunk/po/et.po
trunk/po/fi.po
trunk/po/fr.po
trunk/po/gl.po
trunk/po/hu.po
trunk/po/id.po
trunk/po/it.po
trunk/po/ja.po
trunk/po/nb.po
trunk/po/pl.po
trunk/po/pt.po
trunk/po/pt_BR.po
trunk/po/ro.po
trunk/po/ru.po
trunk/po/sk.po
trunk/po/sv.po
trunk/po/tr.po
trunk/po/zh_CN.po
trunk/po/zh_TW.po
trunk/scd/ChangeLog
trunk/scd/scdaemon.c
trunk/tools/gpgconf-comp.c
Log:
Make --allow-admin the default.
Modified: trunk/scd/ChangeLog
===================================================================
--- trunk/scd/ChangeLog 2009-01-27 16:38:33 UTC (rev 4922)
+++ trunk/scd/ChangeLog 2009-01-28 14:18:40 UTC (rev 4923)
@@ -1,3 +1,8 @@
+2009-01-28 Werner Koch <wk at g10code.com>
+
+ * scdaemon.c (main): Make --allow-admin the default and make the
+ option a dummy.
+
2009-01-27 Werner Koch <wk at g10code.com>
* app-geldkarte.c: Changed to use an AID.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-01-27 16:38:33 UTC (rev 4922)
+++ trunk/NEWS 2009-01-28 14:18:40 UTC (rev 4923)
@@ -1,7 +1,9 @@
Noteworthy changes in version 2.0.11 (unreleased)
-------------------------------------------------
+ * [scdaemon] --allow-admin is now the default.
+
Noteworthy changes in version 2.0.10 (2009-01-12)
-------------------------------------------------
Modified: trunk/doc/scdaemon.texi
===================================================================
--- trunk/doc/scdaemon.texi 2009-01-27 16:38:33 UTC (rev 4922)
+++ trunk/doc/scdaemon.texi 2009-01-28 14:18:40 UTC (rev 4923)
@@ -272,15 +272,17 @@
Even if a card reader features a keypad, do not try to use it.
- at item --allow-admin
- at itemx --deny-admin
+ at item --deny-admin
+ at opindex deny-admin
@opindex allow-admin
- at opindex deny-admin
-This enables the use of Admin class commands for card applications
-where this is supported. Currently we support it for the OpenPGP
-card. Deny is the default. This commands is useful to inhibit
-accidental access to admin class command which could ultimately lock
-the card through wrong PIN numbers.
+This option disables the use of admin class commands for card
+applications where this is supported. Currently we support it for the
+OpenPGP card. This commands is useful to inhibit accidental access to
+admin class command which could ultimately lock the card through wrong
+PIN numbers. Note that GnuPG versions older than 2.0.11 featured an
+ at option{--allow-admin} command which was required to use such admin
+commands. This option has no more effect today because the default is
+now to allow admin commands.
@item --disable-application @var{name}
@opindex disable-application
@@ -305,16 +307,19 @@
* NKS Card:: The Telesec NetKey card application
* DINSIG Card:: The DINSIG card application
* PKCS#15 Card:: The PKCS#15 card application
+* Geldkarte Card:: The Geldkarte application
@end menu
@node OpenPGP Card
@subsection The OpenPGP card application ``openpgp''
This application is currently only used by @command{gpg} but may in
-future also be useful with @command{gpgsm}.
+future also be useful with @command{gpgsm}. Version 1 and version 2 of
+the card is supported.
-The specification for such a card is available at
- at uref{http://g10code.com/docs/openpgp-card-1.0.pdf}.
+The specifications for these cards are available at
+ at uref{http://g10code.com/docs/openpgp-card-1.0.pdf} and
+ at uref{http://g10code.com/docs/openpgp-card-2.0.pdf}.
@node NKS Card
@subsection The Telesec NetKey card ``nks''
@@ -336,7 +341,14 @@
This is common fraqmework for smart card applications. It is used by
@command{gpgsm}.
+ at node Geldkarte Card
+ at subsection The Geldkarte card application ``geldkarte''
+This is a simple application to display information of a German
+Geldkarte. The Geldkarte is a small amount debit card application which
+comes with almost all German banking cards.
+
+
@c *******************************************
@c *************** ****************
@c *************** FILES ****************
Modified: trunk/po/be.po [not shown]
Modified: trunk/po/ca.po [not shown]
Modified: trunk/po/cs.po [not shown]
Modified: trunk/po/da.po [not shown]
Modified: trunk/po/de.po [not shown]
Modified: trunk/po/el.po [not shown]
Modified: trunk/po/eo.po [not shown]
Modified: trunk/po/es.po [not shown]
Modified: trunk/po/et.po [not shown]
Modified: trunk/po/fi.po [not shown]
Modified: trunk/po/fr.po [not shown]
Modified: trunk/po/gl.po [not shown]
Modified: trunk/po/hu.po [not shown]
Modified: trunk/po/id.po [not shown]
Modified: trunk/po/it.po [not shown]
Modified: trunk/po/ja.po [not shown]
Modified: trunk/po/nb.po [not shown]
Modified: trunk/po/pl.po [not shown]
Modified: trunk/po/pt.po [not shown]
Modified: trunk/po/pt_BR.po [not shown]
Modified: trunk/po/ro.po [not shown]
Modified: trunk/po/ru.po [not shown]
Modified: trunk/po/sk.po [not shown]
Modified: trunk/po/sv.po [not shown]
Modified: trunk/po/tr.po [not shown]
Modified: trunk/po/zh_CN.po [not shown]
Modified: trunk/po/zh_TW.po [not shown]
Modified: trunk/scd/scdaemon.c
===================================================================
--- trunk/scd/scdaemon.c 2009-01-27 16:38:33 UTC (rev 4922)
+++ trunk/scd/scdaemon.c 2009-01-28 14:18:40 UTC (rev 4923)
@@ -136,9 +136,9 @@
N_("|N|disconnect the card after N seconds of inactivity")),
ARGPARSE_s_n (oDisableKeypad, "disable-keypad",
N_("do not use a reader's keypad")),
- ARGPARSE_s_n (oAllowAdmin, "allow-admin",
- N_("allow the use of admin card commands")),
- ARGPARSE_s_n (oDenyAdmin, "deny-admin", "@"),
+ ARGPARSE_s_n (oAllowAdmin, "allow-admin", "@"),
+ ARGPARSE_s_n (oDenyAdmin, "deny-admin",
+ N_("deny the use of admin card commands")),
ARGPARSE_s_s (oDisableApplication, "disable-application", "@"),
ARGPARSE_end ()
@@ -399,6 +399,7 @@
may_coredump = disable_core_dumps ();
/* Set default options. */
+ opt.allow_admin = 1;
opt.pcsc_driver = DEFAULT_PCSC_DRIVER;
#ifdef HAVE_W32_SYSTEM
@@ -534,7 +535,8 @@
case oDisableKeypad: opt.disable_keypad = 1; break;
- case oAllowAdmin: opt.allow_admin = 1; break;
+ case oAllowAdmin: /* Dummy because allow is now the default. */
+ break;
case oDenyAdmin: opt.allow_admin = 0; break;
case oCardTimeout: opt.card_timeout = pargs.r.ret_ulong; break;
@@ -629,7 +631,7 @@
#ifdef HAVE_LIBUSB
printf ("disable-ccid:%lu:\n", GC_OPT_FLAG_NONE );
#endif
- printf ("allow-admin:%lu:\n", GC_OPT_FLAG_NONE );
+ printf ("deny-admin:%lu:\n", GC_OPT_FLAG_NONE );
printf ("disable-keypad:%lu:\n", GC_OPT_FLAG_NONE );
printf ("card-timeout:%lu:%d:\n", GC_OPT_FLAG_DEFAULT, 0);
Modified: trunk/tools/gpgconf-comp.c
===================================================================
--- trunk/tools/gpgconf-comp.c 2009-01-27 16:38:33 UTC (rev 4922)
+++ trunk/tools/gpgconf-comp.c 2009-01-28 14:18:40 UTC (rev 4923)
@@ -622,8 +622,8 @@
{ "Security",
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
"gnupg", N_("Options controlling the security") },
- { "allow-admin", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
- "gnupg", "allow the use of admin card commands",
+ { "deny-admin", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
+ "gnupg", "deny the use of admin card commands",
GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
More information about the Gnupg-commits
mailing list