[Pcsclite-cvs-commit] r4940 - /trunk/PCSC/src/winscard.c

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Tue May 11 13:16:05 UTC 2010


Author: rousseau
Date: Tue May 11 13:16:00 2010
New Revision: 4940

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4940
Log:
SCardConnect() & SCardReconnect(): do not reset the cardProtocol in
SCARD_SHARE_DIRECT case since the card have _not_ been reseted. A new
PPS negociation would fail.

See SCardConnect_DIRECT2.py for a Unitary Test 

Modified:
    trunk/PCSC/src/winscard.c

Modified: trunk/PCSC/src/winscard.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard.c?rev=4940&op=diff
==============================================================================
--- trunk/PCSC/src/winscard.c (original)
+++ trunk/PCSC/src/winscard.c Tue May 11 13:16:00 2010
@@ -410,8 +410,6 @@
 					return SCARD_E_PROTO_MISMATCH;
 			}
 		}
-		else
-			rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
 	}
 
 	*pdwActiveProtocol = rContext->readerState->cardProtocol;
@@ -711,8 +709,6 @@
 					return SCARD_E_PROTO_MISMATCH;
 			}
 		}
-		else
-			rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
 	}
 
 	*pdwActiveProtocol = rContext->readerState->cardProtocol;




More information about the Pcsclite-cvs-commit mailing list