update scripts

DangerousThings · Dec 10, 2023 · 6df13c7 · 6df13c7
1 parent c112e47
commit 6df13c7
Show file tree

Hide file tree

Showing 9 changed files with 94 additions and 6 deletions.
diff --git a/.vscode/jcardsim_totp.cfg b/.vscode/jcardsim_totp.cfg
@@ -0,0 +1,5 @@
+com.licel.jcardsim.card.applet.0.AID=A0000005272101014150455801
+com.licel.jcardsim.card.applet.0.Class=com.vivokey.otp.YkneoOath
+com.licel.jcardsim.card.ATR=3B8D80010031C173C8400052A51000900070
+com.licel.jcardsim.vsmartcard.host=localhost
+com.licel.jcardsim.vsmartcard.port=35963
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -29,7 +29,7 @@
             "projectName": "fido2applet",
             "args": [
                 "${workspaceFolder}/.vscode/jcardsim_fido2.1.cfg",
-                "<", "${workspaceFolder}/cpipe"
+                // "<", "${workspaceFolder}/cpipe"
             ],
             "classPaths": [
                 "${workspaceFolder}/smartcard-ci/jcardsim/target/jcardsim-3.0.5-SNAPSHOT.jar",
@@ -84,6 +84,37 @@
             ],
             "console": "integratedTerminal",
             "preLaunchTask": "Compile Spark"
+        },
+        {
+            "type": "java",
+            "name": "Jcardsim TOTP",
+            "request": "launch",
+            "mainClass": "com.licel.jcardsim.remote.VSmartCard",
+            "projectName": "totp",
+            "args": [
+                "${workspaceFolder}/.vscode/jcardsim_totp.cfg"
+            ],
+            "classPaths": [
+                "${workspaceFolder}/smartcard-ci/jcardsim/target/jcardsim-3.0.5-SNAPSHOT.jar",
+                "${workspaceFolder}/applets/apex-totp/target"
+            ],
+            "console": "integratedTerminal",
+            "preLaunchTask": "Compile TOTP",
+            "stepFilters": {
+                "classNameFilters": [
+                    "java.*",
+                    "javax.*",
+                    "com.sun.*",
+                    "sun.*",
+                    "sunw.*",
+                    "org.omg.*",
+                    "com.licel.jcardsim.*",
+                    "com.licel.jcardsim.base.*"
+                ],
+                "skipSynthetics": false,
+                "skipStaticInitializers": false,
+                "skipConstructors": false
+            }
         }
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -14,11 +14,25 @@
         "!**/applets/apex-ndef/**",
         "!**/applets/apex-spark",
         "!**/applets/apex-spark/**",
+        "!**/applets/apex-totp",
+        "!**/applets/apex-totp/**",
         "!**/smartcard-ci/jcardsim",
         "!**/smartcard-ci/jcardsim/**"
     ],
+    "java.debug.settings.exceptionBreakpoint.skipClasses": [
+        "$JDK",
+        "$Libraries",
+        "com.licel.jcardsim.*",
+        "com.licel.jcardsim.base.*"
+    ],
+    "java.debug.settings.stepping.skipClasses": [
+        "$JDK",
+        "$Libraries",
+        "com.licel.jcardsim.*",
+        "com.licel.jcardsim.base.*"
+    ],
     "java.debug.settings.onBuildFailureProceed": true,
     "java.format.settings.url": "eclipse-formatter.xml",
-    "java.debug.settings.showHex": false,
+    "java.debug.settings.showHex": true,
     "java.configuration.updateBuildConfiguration": "interactive"
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -63,7 +63,7 @@
             },
             "group": {
                 "kind": "build",
-                "isDefault": true
+                "isDefault": false
             },
             "problemMatcher": []
         },
@@ -83,6 +83,22 @@
             },
             "problemMatcher": []
         },
+        {
+            "label": "Compile TOTP",
+            "type": "shell",
+            "command": "JAVA_HOME=$JAVA_HOME_JDK8 ant",
+            "options": {
+                "cwd": "${workspaceFolder}/applets/apex-totp",
+                "env": {
+                    "JC_HOME": "${workspaceFolder}/applets/apex-totp/oracle_javacard_sdks/jc304_kit"
+                }
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": false
+            },
+            "problemMatcher": []
+        },
         {
             "label": "Clean FIDO2",
             "type": "shell",
@@ -126,6 +142,12 @@
             "command": "rm -rf ${workspaceFolder}/applets/apex-spark/target",
             "problemMatcher": []
         },
+        {
+            "label": "Clean TOTP",
+            "type": "shell",
+            "command": "rm -rf ${workspaceFolder}/applets/apex-totp/target",
+            "problemMatcher": []
+        },
         {
             "label": "Document NDEF",
             "type": "shell",
@@ -196,6 +218,12 @@
             "type": "shell",
             "command": "${workspaceFolder}/.vscode/setup_ndef.sh",
             "problemMatcher": [],
+        },
+        {
+            "label": "Setup TOTP",
+            "type": "shell",
+            "command": "${workspaceFolder}/.vscode/setup_totp.sh",
+            "problemMatcher": [],
         }
     ]
 }
diff --git a/applets/FIDO2Applet b/applets/FIDO2Applet
diff --git a/applets/apex-totp b/applets/apex-totp
diff --git a/scripts/clean/apex-spark.sh b/scripts/clean/apex-spark.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd /app/src/applets/apex-spark
+rm -rf target
diff --git a/scripts/compile/FIDO2Applet.sh b/scripts/compile/FIDO2Applet.sh
@@ -2,5 +2,5 @@
 
 mkdir -p /app/src/bin
 cd /app/src/applets/FIDO2Applet
-JC_HOME=/app/sdks/jc304_kit ./gradlew -PPackageID='A0:00:00:06:47:2F:00:01' -PApplicationID='A0:00:00:06:47:2F:00:01:01' buildJavaCard classes
+JC_HOME=/app/sdks/jc304_kit ./gradlew -PPackageID=A0000006472F0001 -PApplicationID=A0000006472F000101 buildJavaCard classes
 cp /app/src/applets/FIDO2Applet/build/javacard/*.cap /app/src/bin/
diff --git a/scripts/compile/apex-spark.sh b/scripts/compile/apex-spark.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+mkdir -p /app/src/bin /app/src/applets/apex-spark/target
+cd /app/src/applets/apex-spark
+JC_HOME=/app/sdks/jc305u3_kit ant
+cp /app/src/applets/apex-spark/target/*.cap /app/src/bin/
+2 −2		gradle.properties
+2 −1		python_tests/ctap/test_extended_apdus.py
+19 −64		src/main/java/us/q3q/fido2/FIDO2Applet.java
+57 −0		.classpath
+34 −0		.project
+1 −1		build.xml
+116 −0		pom.xml
+0 −0		src/com/vivokey/otp/OathObj.java
+0 −0		src/com/vivokey/otp/YkneoOath.java
+68 −0		test/totp.py