[Pcsclite-cvs-commit] MCardApplet CardEdge.src,1.3,1.4

home_pw-guest@quantz.debian.org home_pw-guest@quantz.debian.org
Sun, 18 Jan 2004 07:24:08 +0100


Update of /cvsroot/muscleplugins/MCardApplet
In directory quantz:/tmp/cvs-serv28876

Modified Files:
	CardEdge.src 
Log Message:
sync with src/CardEdge.java tag rel_0-9-11, applying r1.5 and r1.6

Index: CardEdge.src
===================================================================
RCS file: /cvsroot/muscleplugins/MCardApplet/CardEdge.src,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CardEdge.src	4 Jul 2002 00:09:58 -0000	1.3
+++ CardEdge.src	18 Jan 2004 06:24:06 -0000	1.4
@@ -160,8 +160,13 @@
     private final static byte INS_CHANGE_PIN =	(byte) 0x44;
     private final static byte INS_UNBLOCK_PIN =	(byte) 0x46;
     private final static byte INS_LOGOUT_ALL =	(byte) 0x60;
+#ifdef ORIGINAL_INS
     private final static byte INS_GET_CHALLENGE = (byte) 0x62;
     private final static byte INS_EXT_AUTH	= (byte) 0x38;
+#else
+    private static final byte INS_LOGOUT_ALL = (byte)0x70;
+    private static final byte INS_GET_CHALLENGE = (byte)0x72;
+#endif
 
     // Objects' use and management
     private final static byte INS_CREATE_OBJ =	(byte) 0x5A;
@@ -2322,6 +2327,8 @@
 	    key_it++;
 	    apdu.setOutgoingAndSend((short) 0, (short) (5 + KEY_ACL_SIZE));
 	}
+	else
+	    ISOException.throwIt((short)ISO7816.SW_WRONG_LENGTH);
     }
 
     private void GetChallenge(APDU apdu, byte[] buffer) {