← Back to branch summary

~ubuntu-branches/ubuntu/precise/gnupg2/precise-proposed

« back to all changes in this revision

Viewing changes to scd/scdaemon.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Urlichs
  • Date: 2006-01-24 04:31:42 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20060124043142-pbg192or6qxv3yk2
Tags: 1.9.20-1
http://bugs.debian.org/306890
http://bugs.debian.org/344530
http://bugs.debian.org/320490
http://bugs.debian.org/348106
* New Upstream version. Closes:#306890,#344530
  * Closes:#320490: gpg-protect-tool fails to decrypt PKCS-12 files 
* Depend on libopensc2-dev, not -1-. Closes:#348106

Show diffs side-by-side

added added

removed removed

Lines of Context:
scd/scdaemon.c
84
84
  opcscDriver,
85
85
  oDisableCCID,
86
86
  oDisableOpenSC,
 
87
  oDisableKeypad,
87
88
  oAllowAdmin,
88
89
  oDenyAdmin,
89
90
  oDisableApplication,
126
127
                                    "@"
127
128
#endif
128
129
                                         /* end --disable-ccid */},
 
130
  { oDisableKeypad, "disable-keypad", 0, N_("do not use a reader's keypad")},
129
131
  { oAllowAdmin, "allow-admin", 0, N_("allow the use of admin card commands")},
130
132
  { oDenyAdmin,  "deny-admin",  0, "@" },  
131
133
  { oDisableApplication, "disable-application", 2, "@"},
135
137
 
136
138
 
137
139
/* The card dirver we use by default for PC/SC.  */
138
 
#ifdef HAVE_W32_SYSTEM
 
140
#if defined(HAVE_W32_SYSTEM) || defined(__CYGWIN__)
139
141
#define DEFAULT_PCSC_DRIVER "winscard.dll"
140
142
#else
141
143
#define DEFAULT_PCSC_DRIVER "libpcsclite.so"
489
491
        case oDisableCCID: opt.disable_ccid = 1; break;
490
492
        case oDisableOpenSC: break;
491
493
 
 
494
        case oDisableKeypad: opt.disable_keypad = 1; break;
 
495
 
492
496
        case oAllowAdmin: opt.allow_admin = 1; break;
493
497
        case oDenyAdmin: opt.allow_admin = 0; break;
494
498