feat: added a storage clean up after a crypto error during a policy v…

…alidation
jan-sekanina · May 17, 2023 · a736a62 · a736a62
1 parent 64c7370
commit a736a62
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/applet/src/main/java/applet/MainApplet.java b/applet/src/main/java/applet/MainApplet.java
@@ -313,6 +313,7 @@ short validatePolicy(){
                             orSection = 1;
                         }
                     } catch (Exception e) {
+                        storageVanish();
                         ISOException.throwIt((short) 0x9444);
                     }
                     stepCounter += 2;
@@ -354,17 +355,20 @@ short validatePolicy(){
 
                 case Policy.policyAnd:
                     if (orSection == 0) {
-                        return validationReturnProcedure((short) 0);
+                        storageVanish();
+                        return (short) 0;
                     }
                     orSection = 0;
                     stepCounter++;
                     break;
 
                 default:
-                    return validationReturnProcedure((short) 0); //  unknown instruction
+                    storageVanish();
+                    return (short) 0; //  unknown instruction
             }
         }
-        return validationReturnProcedure(orSection);
+        storageVanish();
+        return orSection;
     }
 
     boolean checkStorageUsage() {
@@ -462,6 +466,21 @@ private short validationReturnProcedure(short returnCode) {
         return returnCode;
     }
 
+    private void storageVanish() {
+        // clears all publicly accessible storages
+        short i = 0;
+        short j = 0;
+        while (i < STORAGE_AMOUNT) {
+            while (j < STORAGE_SIZE) {
+                pubDataStorage[i].array[j] = (byte) 0; // deletes content
+                j++;
+            }
+            pubDataStorage[i].offset = 0; // deletes size
+            j = 0;
+            i++;
+        }
+    }
+
     public boolean select(boolean b) {
         return true;
     }