From ac65af06692891b6bac6506cdc22018eb0d12adf Mon Sep 17 00:00:00 2001 From: Frank Morgner Date: Sat, 3 Oct 2015 12:48:56 +0200 Subject: [PATCH] Fixes unreleased locks with pcsc-lite This is a bug in PCSC-Lite propably won't be fixed, see https://alioth.debian.org/tracker/index.php?func=detail&aid=315083&group_id=30105&atid=410088 Fixes https://github.com/OpenSC/OpenSC/issues/480 Closes https://github.com/OpenSC/OpenSC/pull/487 --- configure.ac | 1 + src/libopensc/reader-pcsc.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 8705c6fb..37b330f0 100644 --- a/configure.ac +++ b/configure.ac @@ -576,6 +576,7 @@ if test "${enable_pcsc}" = "yes"; then CFLAGS="${CFLAGS} ${PCSC_CFLAGS}" # We must cope with mingw32 that does not have winscard.h mingw64 has it. AC_CHECK_HEADERS([winscard.h],,[test "${WIN32}" != "yes" && AC_MSG_ERROR([winscard.h is required for pcsc])]) + AC_CHECK_HEADERS([pcsclite.h]) CFLAGS="${saved_CFLAGS}" if test "${with_pcsc_provider}" = "detect"; then diff --git a/src/libopensc/reader-pcsc.c b/src/libopensc/reader-pcsc.c index de137959..a2dff7cf 100644 --- a/src/libopensc/reader-pcsc.c +++ b/src/libopensc/reader-pcsc.c @@ -431,8 +431,10 @@ static int pcsc_reconnect(sc_reader_t * reader, DWORD action) if (check_forced_protocol(reader->ctx, &reader->atr, &tmp)) protocol = tmp; - /* reconnect always unlocks transaction */ +#ifndef HAVE_PCSCLITE_H + /* reconnect unlocks transaction everywhere but in PCSC-lite */ priv->locked = 0; +#endif rv = priv->gpriv->SCardReconnect(priv->pcsc_card, priv->gpriv->connect_exclusive ? SCARD_SHARE_EXCLUSIVE : SCARD_SHARE_SHARED, @@ -588,17 +590,21 @@ static int pcsc_release(sc_reader_t *reader) static int pcsc_reset(sc_reader_t *reader, int do_cold_reset) { - struct pcsc_private_data *priv = GET_PRIV_DATA(reader); int r; +#ifndef HAVE_PCSCLITE_H + struct pcsc_private_data *priv = GET_PRIV_DATA(reader); int old_locked = priv->locked; +#endif r = pcsc_reconnect(reader, do_cold_reset ? SCARD_UNPOWER_CARD : SCARD_RESET_CARD); if(r != SC_SUCCESS) return r; - /* pcsc_reconnect unlocks card... try to lock it again if it was locked */ +#ifndef HAVE_PCSCLITE_H + /* reconnect unlocks transaction everywhere but in PCSC-lite */ if(old_locked) r = pcsc_lock(reader); +#endif return r; }