security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity
gnupg/scd
History
Werner Koch 9ab9f414fb scd: acquire lock in new_reader_slot. 
* scd/apdu.c (new_reader_slot): Acquire lock.
(open_ct_reader, open_pcsc_reader_direct, open_pcsc_reader_wrapped)
(open_ccid_reader, open_rapdu_reader): Release lock.
(lock_slot, trylock_slot, unlock_slot): Move more to the top.

--
Fixes a test case of:
   No libpcsclite1 installed.
   Run gpg-agent
   Run command "gpg-connect-agent learn /bye" with no card/token
   Sometimes it fails: ERR 100663356 Not supported <SCD>
   While it should be always: ERR 100663404 Card error <SCD>

(cherry picked from commit 4f557cb9c2)

Resolved conflicts:
	scd/apdu.c: pth/npth changes. Move lock helpers to the top.
                    Take care of removed pcsc_no_service.
 		2014-03-10 16:07:46 +01:00
..
ChangeLog-2011 Generate the ChangeLog from commit logs. 2011-12-01 11:09:02 +01:00
Makefile.am w32: Add icons and version information. 2013-05-07 21:35:48 +02:00
apdu.c scd: acquire lock in new_reader_slot. 2014-03-10 16:07:46 +01:00
apdu.h scd: Rename 'keypad' to 'pinpad'. 2013-02-08 09:06:39 +09:00
app-common.h gpg: Make decryption with the OpenPGP card work. 2013-08-28 17:40:32 +02:00
app-dinsig.c scd: Rename 'keypad' to 'pinpad'. 2013-02-08 09:06:39 +09:00
app-geldkarte.c Nuked almost all trailing white space. 2011-02-04 12:57:53 +01:00
app-help.c Nuked almost all trailing white space. 2011-02-04 12:57:53 +01:00
app-nks.c scd: Suppress gcc warning about possible uninitialized use. 2013-08-30 10:28:26 +02:00
app-openpgp.c scd: add support for RSA_CRT and RSA_CRT_N key import. 2013-08-29 17:53:14 +02:00
app-p15.c Change all quotes in strings and comments to the new GNU standard. 2012-06-05 19:29:22 +02:00
app.c gpg: Make decryption with the OpenPGP card work. 2013-08-28 17:40:32 +02:00
atr.c scd: Add option --dump-atr to command APDU. 2011-12-15 15:21:02 +01:00
atr.h scd: Add option --dump-atr to command APDU. 2011-12-15 15:21:02 +01:00
card-common.h Nuked almost all trailing white space. 2011-02-04 12:57:53 +01:00
card-dinsig.c Nuked almost all trailing white space. 2011-02-04 12:57:53 +01:00
card-p15.c Nuked almost all trailing white space. 2011-02-04 12:57:53 +01:00
card.c Change all quotes in strings and comments to the new GNU standard. 2012-06-05 19:29:22 +02:00
ccid-driver.c scd: Use vendor and product id macros also in apdu.c 2013-08-30 09:28:17 +02:00
ccid-driver.h scd: Use vendor and product id macros also in apdu.c 2013-08-30 09:28:17 +02:00
command.c gpg: Make decryption with the OpenPGP card work. 2013-08-28 17:40:32 +02:00
iso7816.c scd: Rename 'keypad' to 'pinpad'. 2013-02-08 09:06:39 +09:00
iso7816.h scd: Rename 'keypad' to 'pinpad'. 2013-02-08 09:06:39 +09:00
pcsc-wrapper.c Fix syntax error for building on APPLE. 2014-03-07 08:57:09 +01:00
sc-copykeys.c SCD: API cleanup for keypad handling. 2013-02-05 13:37:06 +09:00
scdaemon-w32info.rc w32: Add icons and version information. 2013-05-07 21:35:48 +02:00
scdaemon.c w32: Silence warnings about unused vars. 2014-03-07 16:11:15 +01:00
scdaemon.h scd: Rename 'keypad' to 'pinpad'. 2013-02-08 09:06:39 +09:00