[Pcsclite-cvs-commit] Drivers/ccid/src/openct proto-t1.c,1.13,1.14

[rousseau@haydn.debian.org]

Update of /cvsroot/pcsclite/Drivers/ccid/src/openct
In directory haydn:/tmp/cvs-serv6309

Modified Files:
	proto-t1.c 
Log Message:
this code fails EMV test 1771-4 (should be a residue)


Index: proto-t1.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/openct/proto-t1.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- proto-t1.c	26 Jul 2004 13:41:14 -0000	1.13
+++ proto-t1.c	27 Jul 2004 06:42:57 -0000	1.14
@@ -310,24 +310,14 @@
 					continue;
 				}
 
-				if (T1_I_BLOCK == t1_block_type(t1->previous_block[PCB]))
-				{
-					DEBUG_COMM("repeat I-Block");
-					slen = t1_build(t1, sdata, dad, T1_I_BLOCK,
-						&sbuf, &last_send);
-					continue;
-				}
-				else
-				{
-					DEBUG_COMM("R-Block required");
-					/* ISO 7816-3 Rule 7.4.2 */
-					if (retries == 0)
-						goto resync;
-					slen = t1_build(t1, sdata,
-							dad, T1_R_BLOCK | T1_OTHER_ERROR,
-							NULL, NULL);
-					continue;
-				}
+				DEBUG_COMM("R-Block required");
+				/* ISO 7816-3 Rule 7.4.2 */
+				if (retries == 0)
+					goto resync;
+				slen = t1_build(t1, sdata,
+						dad, T1_R_BLOCK | T1_OTHER_ERROR,
+						NULL, NULL);
+				continue;
 			}
 
 			if (t1->state == RECEIVING) {