[Pcsclite-cvs-commit] r6310 - /trunk/Drivers/ccid/src/openct/proto-t1.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Sat May 26 15:10:07 2012
New Revision: 6310

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=6310
Log:
t1_xcv(): always return a negative value in case of error

Thanks to Martin Vogt for the patch
http://archives.neohapsis.com/archives/dev/muscle/2012-q2/0057.html

Modified:
    trunk/Drivers/ccid/src/openct/proto-t1.c

Modified: trunk/Drivers/ccid/src/openct/proto-t1.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/openct/proto-t1.c?rev=6310&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/openct/proto-t1.c (original)
+++ trunk/Drivers/ccid/src/openct/proto-t1.c Sat May 26 15:10:07 2012
@@ -665,7 +665,7 @@
 
 		n = CCID_Transmit(t1 -> lun, slen, block, rmax, t1->wtx);
 		if (n != IFD_SUCCESS)
-			return n;
+			return -1;
 
 		/* the second argument of CCID_Receive() is (unsigned int *)
 		 * so we can't use &rmax since &rmax is a (size_t *) and may not
@@ -682,7 +682,7 @@
 
 		n = CCID_Transmit(t1 -> lun, 0, block, rmax, t1->wtx);
 		if (n != IFD_SUCCESS)
-			return n;
+			return -1;
 
 		rmax_int = rmax;
 		n = CCID_Receive(t1 -> lun, &rmax_int, &block[3], NULL);
@@ -699,7 +699,7 @@
 		n = CCID_Transmit(t1 -> lun, slen, block, 0, t1->wtx);
 		t1->wtx = 0;	/* reset to default value */
 		if (n != IFD_SUCCESS)
-			return n;
+			return -1;
 
 		/* Get the response en bloc */
 		rmax_int = rmax;