Test applet locking behavior

hwb1/card/test.txt

@@ -6,6 +6,9 @@ card_connect
 // select
 send_apdu -sc 0 -APDU 00A40400080102030405060809
 
+// Public Command
+send_apdu -sc 0 -APDU 80000000
+
 // Locked Commands
 send_apdu -sc 0 -APDU 8002000002FFFE
 
@@ -13,14 +16,14 @@ send_apdu -sc 0 -APDU 8002000002FFFE
 send_apdu -sc 0 -APDU 802000000431313131
 
 // Still Locked Commands
-send_apdu -sc 0 -APDU 800400000001
+send_apdu -sc 0 -APDU 8004000000
 
 // Unlock Card With Correct PIN
 send_apdu -sc 0 -APDU 802000000431323334
 
 // Now Unlocked Commands
 send_apdu -sc 0 -APDU 8002000002FFFE
-send_apdu -sc 0 -APDU 800400000001
+send_apdu -sc 0 -APDU 8004000001
 
 // Query Author Name
 send_apdu -sc 0 -APDU 80000000
@@ -29,8 +32,8 @@ send_apdu -sc 0 -APDU 80000000
 send_apdu -sc 0 -APDU 8002000002FFFE
 
 // Querying Data
-send_apdu -sc 0 -APDU 800400000001
-send_apdu -sc 0 -APDU 800400000002
+send_apdu -sc 0 -APDU 8004000001
+send_apdu -sc 0 -APDU 8004000002
 
 // Triggering Unsupported Instruction Error
 send_apdu -sc 0 -APDU 8001000000
@@ -43,7 +46,22 @@ send_apdu -sc 0 -APDU 80020000150102030405060708090A0B0C0D0E0F101112131415
 
 // Querying Incorrect Amount of Bytes
 send_apdu -sc 0 -APDU 8002000002FFFE
-send_apdu -sc 0 -APDU 800400000003
+send_apdu -sc 0 -APDU 8004000003
+
+// De- and re-select applet
+card_disconnect
+card_connect
+send_apdu -sc 0 -APDU 00A40400080102030405060809
+
+// Exceed maximum of PIN unlock trials
+send_apdu -sc 0 -APDU 802000000431313131
+send_apdu -sc 0 -APDU 802000000431313131
+send_apdu -sc 0 -APDU 802000000431313131
+
+// De- and re-select applet in locked state
+card_disconnect
+card_connect
+send_apdu -sc 0 -APDU 00A40400080102030405060809
 
 card_disconnect
 release_context

hwb1/src/hwb1/MyApplet.java

@@ -14,6 +14,7 @@ import javacard.framework.*;
  */
 public class MyApplet extends Applet {
     final static short SW_PIN_VERIFICATION_REQUIRED = 0x6301;
+    final static short SW_VERIFICATION_FAILED = 0x6300;
     final static byte PIN_TRY_LIMIT =(byte)0x03;
     final static byte MAX_PIN_SIZE =(byte)0x08;
     private byte[] authorName = new byte[] { 'M', 'a', 'n', 'u', 'e', 'l' };
@@ -52,14 +53,6 @@ public class MyApplet extends Applet {
         register();
     }
 
-    public boolean select() {
-        if (pin.getTriesRemaining() == 0) {
-            return false;
-        } else {
-            return super.select();
-        }
-    }
-
     public void deselect() {
         super.deselect();
         pin.reset();
@@ -76,7 +69,11 @@ public class MyApplet extends Applet {
         byte[] buffer = apdu.getBuffer();
         
         if (selectingApplet()) {
+            if (pin.getTriesRemaining() == 0) {
+                ISOException.throwIt(SW_VERIFICATION_FAILED);
+            } else {
                 ISOException.throwIt(ISO7816.SW_NO_ERROR);
+            }
         } else {
             if (buffer[ISO7816.OFFSET_CLA] != (byte)0x80) {
                 ISOException.throwIt(ISO7816.SW_CLA_NOT_SUPPORTED);
@@ -85,8 +82,8 @@ public class MyApplet extends Applet {
                 byte instruction = buffer[ISO7816.OFFSET_INS];
 
                 switch (instruction) {
-                	case 0x04:
                     case 0x02:
+                    case 0x04:
                         authenticationRequired = !pin.isValidated();
                         break;
                 }
@@ -127,7 +124,10 @@ public class MyApplet extends Applet {
                             break;
                         case 0x20:
                             length = apdu.setIncomingAndReceive();
-	                        pin.check(buffer, (short) ISO7816.OFFSET_CDATA, (byte)length);
+
+                            if (!pin.check(buffer, (short) ISO7816.OFFSET_CDATA, (byte)length)) {
+                                ISOException.throwIt(SW_VERIFICATION_FAILED);
+                            }
                             break;
                         default:
                             ISOException.throwIt(ISO7816.SW_INS_NOT_SUPPORTED);