Non-extlen broken after 88f4179

The logic added for JC221 was incorrectly sign-extending the value of Lc.
arekinath · May 29, 2020 · 339e473 · 339e473
1 parent f984e3b
commit 339e473
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/src/net/cooperi/pivapplet/PivApplet.java b/src/net/cooperi/pivapplet/PivApplet.java
@@ -579,6 +579,15 @@ public class PivApplet extends Applet
 		return (false);
 	}
 
+/*#if !APPLET_EXTLEN
+	private short
+	getIncomingLengthCompat(final APDU apdu)
+	{
+		final byte[] buf = apdu.getBuffer();
+		return ((short)((short)buf[ISO7816.OFFSET_LC] & 0x00FF));
+	}
+#endif*/
+
 	private void
 	lockPINAlwaysSlots()
 	{
@@ -948,7 +957,7 @@ else if (key == (byte)0x81)
 //#if APPLET_EXTLEN
 			final short lc = apdu.getIncomingLength();
 /*#else
-			final short lc = buf[ISO7816.OFFSET_LC];
+			final short lc = getIncomingLengthCompat(apdu);
 #endif*/
 			if (recvLen != lc) {
 				ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
@@ -1019,7 +1028,7 @@ else if (key == (byte)0x81)
 //#if APPLET_EXTLEN
 		final short inLc = apdu.getIncomingLength();
 /*#else
-		final short inLc = buffer[ISO7816.OFFSET_LC];
+		final short inLc = getIncomingLengthCompat(apdu);
 #endif*/
 		if (lc != inLc) {
 			ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
@@ -1588,7 +1597,7 @@ else if (key == (byte)0x81)
 //#if APPLET_EXTLEN
 		final short inLc = apdu.getIncomingLength();
 /*#else
-		final short inLc = buffer[ISO7816.OFFSET_LC];
+		final short inLc = getIncomingLengthCompat(apdu);
 #endif*/
 		if (lc != inLc) {
 			ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
@@ -2261,7 +2270,7 @@ else if (key == (byte)0x81)
 //#if APPLET_EXTLEN
 		final short inLc = apdu.getIncomingLength();
 /*#else
-		final short inLc = buffer[ISO7816.OFFSET_LC];
+		final short inLc = getIncomingLengthCompat(apdu);
 #endif*/
 		if (lc != inLc) {
 			ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
@@ -2342,7 +2351,7 @@ else if (key == (byte)0x81)
 //#if APPLET_EXTLEN
 		final short inLc = apdu.getIncomingLength();
 /*#else
-		final short inLc = buffer[ISO7816.OFFSET_LC];
+		final short inLc = getIncomingLengthCompat(apdu);
 #endif*/
 		if (lc != inLc) {
 			ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
@@ -2414,7 +2423,7 @@ else if (key == (byte)0x81)
 //#if APPLET_EXTLEN
 		final short inLc = apdu.getIncomingLength();
 /*#else
-		final short inLc = buffer[ISO7816.OFFSET_LC];
+		final short inLc = getIncomingLengthCompat(apdu);
 #endif*/
 		if (lc != inLc) {
 			ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
@@ -2677,7 +2686,7 @@ else if (key == (byte)0x81)
 //#if APPLET_EXTLEN
 		final short inLc = apdu.getIncomingLength();
 /*#else
-		final short inLc = buffer[ISO7816.OFFSET_LC];
+		final short inLc = getIncomingLengthCompat(apdu);
 #endif*/
 		if (lc != inLc) {
 			ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);