Begin version patching mechanism

StarGate01 · StarGate01 · commit 08ea94ea0b73 · 2023-12-18T05:46:03.000+01:00
diff --git a/docs/notes/command_surface.md b/docs/notes/command_surface.md
@@ -7,7 +7,11 @@ The `CLA` class byte is usually `00`, `80`, `B0`, or any of these `| 10` .
 Standard ISO commands:
 
 - `C0`: GET RESPONSE
-- `A4`: SELECT 
+- `A4`: SELECT
+
+Vivokey extension:
+
+- `F4`: GET VERSION
 
 ## apex-fido2, FIDO2Applet, and u2f-javacard
 
@@ -192,4 +196,4 @@ Keycard commands:
 - `C1`: SET PINLESS PATH
 - `C2`: EXPORT KEY
 - `CA`: GET DATA
-- `E2`: STORE DATA
+- `E2`: STORE DATA
diff --git a/scripts/compile-all.sh b/scripts/compile-all.sh
@@ -13,6 +13,7 @@ for i in compile/*.sh; do
         echo "Skipping $i"
     fi
     if [ "$?" != 0 ]; then
+        echo "Failed to compile $i"
         FAIL=1
     fi
 done
diff --git a/scripts/compile/FIDO2Applet.sh b/scripts/compile/FIDO2Applet.sh
@@ -3,6 +3,7 @@
 source "${0%/*}/res/compile.sh"
 
 prepare_build FIDO2Applet
+patch_version $BUILD/src/main/java/us/q3q/fido2/FIDO2Applet.java
 cd $BUILD
 JC_HOME=/app/sdks/jc304_kit ./gradlew -PPackageID=A0000006472F0001 -PApplicationID=A0000006472F000101 buildJavaCard classes
 cp $BUILD/build/javacard/*.cap /app/src/bin/
diff --git a/scripts/compile/SatochipApplet.sh b/scripts/compile/SatochipApplet.sh
@@ -3,5 +3,6 @@
 source "${0%/*}/res/compile.sh"
 
 prepare_build SatochipApplet
-cp /app/src/scripts/compile/res/SatochipApplet.build.xml $BUILD
-JC_HOME=/app/sdks/jc304_kit build_default -buildfile SatochipApplet.build.xml
+patch_version $BUILD/src/org/satochip/applet/CardEdge.java
+cp -f /app/src/scripts/compile/res/SatochipApplet.build.xml $BUILD/build.xml
+JC_HOME=/app/sdks/jc304_kit build_default
diff --git a/scripts/compile/Satodime-Applet.sh b/scripts/compile/Satodime-Applet.sh
@@ -3,5 +3,6 @@
 source "${0%/*}/res/compile.sh"
 
 prepare_build Satodime-Applet
-cp /app/src/scripts/compile/res/Satodime-Applet.build.xml $BUILD
-JC_HOME=/app/sdks/jc304_kit build_default -buildfile Satodime-Applet.build.xml
+patch_version $BUILD/src/org/satodime/applet/Satodime.java
+cp /app/src/scripts/compile/res/Satodime-Applet.build.xml $BUILD/build.xml
+JC_HOME=/app/sdks/jc304_kit build_default
diff --git a/scripts/compile/Seedkeeper-Applet.sh b/scripts/compile/Seedkeeper-Applet.sh
@@ -3,5 +3,6 @@
 source "${0%/*}/res/compile.sh"
 
 prepare_build Seedkeeper-Applet
-cp /app/src/scripts/compile/res/Seedkeeper-Applet.build.xml $BUILD
-JC_HOME=/app/sdks/jc304_kit build_default -buildfile Seedkeeper-Applet.build.xml
+patch_version $BUILD/src/org/seedkeeper/applet/SeedKeeper.java
+cp /app/src/scripts/compile/res/Seedkeeper-Applet.build.xml $BUILD/build.xml
+JC_HOME=/app/sdks/jc304_kit build_default
diff --git a/scripts/compile/SmartPGP.sh b/scripts/compile/SmartPGP.sh
@@ -3,5 +3,6 @@
 source "${0%/*}/res/compile.sh"
 
 prepare_build SmartPGP
-cp /app/src/scripts/compile/res/SmartPGP.build.xml $BUILD
-JC_HOME=/app/sdks/jc304_kit build_default -buildfile SmartPGP.build.xml
+patch_version $BUILD/src/fr/anssi/smartpgp/SmartPGPApplet.java
+cp /app/src/scripts/compile/res/SmartPGP.build.xml $BUILD/build.xml
+JC_HOME=/app/sdks/jc304_kit build_default
diff --git a/scripts/compile/apex-fido2.sh b/scripts/compile/apex-fido2.sh
@@ -3,4 +3,5 @@
 source "${0%/*}/res/compile.sh"
 
 prepare_build apex-fido2
+patch_version $BUILD/src/main/java/com/vivokey/fido2/Dispatcher.java
 JC_HOME=/app/sdks/jc305u3_kit build_default
diff --git a/scripts/compile/apex-ndef.sh b/scripts/compile/apex-ndef.sh
@@ -3,4 +3,5 @@
 source "${0%/*}/res/compile.sh"
 
 prepare_build apex-ndef
+patch_version $BUILD/src/main/java/com/vivokey/ndef/NDEF.java
 JC_HOME=/app/sdks/jc305u3_kit build_default
diff --git a/scripts/compile/apex-spark.sh b/scripts/compile/apex-spark.sh
@@ -3,4 +3,5 @@
 source "${0%/*}/res/compile.sh"
 
 prepare_build apex-spark
+patch_version $BUILD/src/com/vivokey/spark/Spark2.java
 JC_HOME=/app/sdks/jc305u3_kit build_default
diff --git a/scripts/compile/apex-tesla.sh b/scripts/compile/apex-tesla.sh
@@ -3,4 +3,5 @@
 source "${0%/*}/res/compile.sh"
 
 prepare_build apex-tesla
+patch_version $BUILD/src/com/vivokey/teslaIdent/TeslaIdent.java
 build_default
diff --git a/scripts/compile/apex-totp.sh b/scripts/compile/apex-totp.sh
@@ -3,4 +3,5 @@
 source "${0%/*}/res/compile.sh"
 
 prepare_build apex-totp
+patch_version $BUILD/src/com/vivokey/otp/YkneoOath.java
 JC_HOME=/app/sdks/jc304_kit build_default dist
diff --git a/scripts/compile/flexsecure-ykhmac.sh b/scripts/compile/flexsecure-ykhmac.sh
@@ -3,4 +3,5 @@
 source "${0%/*}/res/compile.sh"
 
 prepare_build flexsecure-ykhmac
+patch_version $BUILD/src/main/java/com/vivokey/ykhmac/YkHMACApplet.java
 build_default dist
diff --git a/scripts/compile/javacard-memory.sh b/scripts/compile/javacard-memory.sh
@@ -3,4 +3,5 @@
 source "${0%/*}/res/compile.sh"
 
 prepare_build javacard-memory dist
+patch_version $BUILD/src/de/chrz/jcmemory/JCMemoryApplet.java
 JC_HOME=/app/sdks/jc304_kit build_default
diff --git a/scripts/compile/openjavacard-ndef.sh b/scripts/compile/openjavacard-ndef.sh
@@ -3,8 +3,12 @@
 source "${0%/*}/res/compile.sh"
 
 prepare_build openjavacard-ndef
+patch_version $BUILD/applet-advanced/src/main/java/org/openjavacard/ndef/advanced/NdefApplet.java
+patch_version $BUILD/applet-full/src/main/java/org/openjavacard/ndef/full/NdefApplet.java
+patch_version $BUILD/applet-stub/src/main/java/org/openjavacard/ndef/stub/NdefApplet.java
+patch_version $BUILD/applet-tiny/src/main/java/org/openjavacard/ndef/tiny/NdefApplet.java
 cd $BUILD
-cp /app/src/scripts/compile/res/openjavacard-ndef.build.xml .
-ant -DJAVACARD_HOME=/app/sdks/jc222_kit -buildfile openjavacard-ndef.build.xml build
+cp -f /app/src/scripts/compile/res/openjavacard-ndef.build.xml build.xml
+ant -DJAVACARD_HOME=/app/sdks/jc222_kit build
 cd build/javacard
 cp *full.cap *tiny.cap /app/src/bin/
diff --git a/scripts/compile/res/apex-ledger-unplugged.build.xml b/scripts/compile/res/apex-ledger-unplugged.build.xml
diff --git a/scripts/compile/res/compile.sh b/scripts/compile/res/compile.sh
@@ -9,6 +9,16 @@ prepare_build() {
     cp -r /app/src/applets/$1 $BUILD
 }
 
+patch_version() {
+    git config --global --add safe.directory /app/src
+    TAG=`git tag --points-at HEAD`
+    SRC="$BUILD/build.xml"
+    if [ ! -f $SRC ]; then
+        SRC="$BUILD/build.gradle"
+    fi
+    /app/src/scripts/compile/res/version.py -s $SRC -p $1 -v $TAG
+}
+
 build_default() {
     cd $BUILD
     mkdir -p $BUILD/target
diff --git a/scripts/compile/res/version.py b/scripts/compile/res/version.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+
+import argparse, os
+
+if __name__ == "__main__":
+    # Parse CLI arguments
+    parser = argparse.ArgumentParser(description = 'FlexSecure-Applets version patching tool')
+    parser.add_argument('-s', '--source', nargs='?', dest='source', type=str, 
+        const='', default='', help='File to read the applet version from')
+    parser.add_argument('-p', '--patch', nargs='?', dest='patch', type=str, 
+        const='', default='', help='File to patch')
+    parser.add_argument('-v', '--version', nargs='?', dest='version', type=str, 
+        const='255.255.255', default='255.255.255', help='Build version to encode')
+    args = parser.parse_args()
+
+    version = args.version.strip("v")
+
+    print("Patching file " + args.patch + " using the applet version from " + args.source + " and the additional build version " + version)
+    
+    if(not os.path.isfile(args.source)):
+        print("error: source file " + args.source + "does not exist")
+        exit(1)
+
+    if(not os.path.isfile(args.patch)):
+        print("error: patch file " + args.patch + "does not exist")
+        exit(1)
diff --git a/scripts/compile/status-keycard.sh b/scripts/compile/status-keycard.sh
@@ -3,6 +3,10 @@
 source "${0%/*}/res/compile.sh"
 
 prepare_build status-keycard
+patch_version $BUILD/src/main/java/im/status/keycard/CashApplet.java
+patch_version $BUILD/src/main/java/im/status/keycard/IdentApplet.java
+patch_version $BUILD/src/main/java/im/status/keycard/KeycardApplet.java
+patch_version $BUILD/src/main/java/im/status/keycard/NDEFApplet.java
 cd $BUILD
 JC_HOME=/app/sdks/jc304_kit ./gradlew convertJavacard
 cp $BUILD/build/javacard/im/status/keycard/javacard/*.cap /app/src/bin/
diff --git a/scripts/compile/u2f-javacard.sh b/scripts/compile/u2f-javacard.sh
@@ -3,5 +3,6 @@
 source "${0%/*}/res/compile.sh"
 
 prepare_build u2f-javacard
-cp /app/src/scripts/compile/res/u2f-javacard.build.xml $BUILD
-JC_HOME=/app/sdks/jc304_kit build_default -buildfile u2f-javacard.build.xml
+patch_version $BUILD/src/main/java/com/ledger/u2f/U2FApplet.java
+cp /app/src/scripts/compile/res/u2f-javacard.build.xml $BUILD/build.xml
+JC_HOME=/app/sdks/jc304_kit build_default
diff --git a/scripts/test-all.sh b/scripts/test-all.sh
@@ -13,6 +13,7 @@ for i in test/*.bats; do
         echo "Skipping $i"
     fi
     if [ "$?" != 0 ]; then
+        echo "Failed to test $i"
         FAIL=1
     fi
 done
