[Pcsclite-cvs-commit] r2854 - /trunk/Drivers/ccid/src/ifdhandler.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Mar 24 12:26:48 2008
New Revision: 2854

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=2854
Log:
IFDHSetProtocolParameters(): store the protocol used in
ccid_desc->cardProtocol even if the reader has CCID_CLASS_AUTO_PPS_PROP.
Correct a potential bug in SecurePINVerify()/SecurePINModify().

Thanks to Jim Dawson for the bug report

Modified:
    trunk/Drivers/ccid/src/ifdhandler.c

Modified: trunk/Drivers/ccid/src/ifdhandler.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ifdhandler.c?rev=2854&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ifdhandler.c (original)
+++ trunk/Drivers/ccid/src/ifdhandler.c Mon Mar 24 12:26:48 2008
@@ -498,7 +498,7 @@
 	/* Do not send CCID command SetParameters or PPS to the CCID
 	 * The CCID will do this himself */
 	if (ccid_desc->dwFeatures & CCID_CLASS_AUTO_PPS_PROP)
-		return IFD_SUCCESS;
+		goto end;
 
 	/* Get ATR of the card */
 	ATR_InitFromArray(&atr, ccid_slot->pcATRBuffer, ccid_slot->nATRLength);
@@ -865,6 +865,7 @@
 		DEBUG_COMM3("T=1: IFSC=%d, IFSD=%d", t1->ifsc, t1->ifsd);
 	}
 
+end:
 	/* store used protocol for use by the secure commands (verify/change PIN) */
 	ccid_desc->cardProtocol = Protocol;