use 8 byte ids

StarGate01 · StarGate01 · commit 54a355c57bbc · 2024-01-17T02:34:35.000+01:00
diff --git a/applets/apex-ndef b/applets/apex-ndef
@@ -1 +1 @@
-Subproject commit f4bce69784fe3edd99e28b334725ea0ffb8b9f4d
+Subproject commit c0603b7c0050ff62eee58c6bc67a0d624b45a01d
diff --git a/applets/apex-spark b/applets/apex-spark
@@ -1 +1 @@
-Subproject commit 75b698fae589cc9de67acf4b78a2db4765a6ee12
+Subproject commit f12ab7f4ac610d5ef4d2a5ec9ac7886f041e7c43
diff --git a/flake.nix b/flake.nix
@@ -32,6 +32,7 @@
               JPype1
               parameterized
               pyasn1
+              requests
               (buildPythonPackage rec {
                 pname = "uhid";
                 version = "0.0.1";
diff --git a/scripts/test/apex-ndef.bats b/scripts/test/apex-ndef.bats
@@ -16,10 +16,10 @@ setup() {
     java -cp /app/tools/jcardsim/target/jcardsim-3.0.5-SNAPSHOT.jar:./target com.licel.jcardsim.remote.VSmartCard /app/src/scripts/test/res/apex-ndef.jcardsim.cfg > /dev/null &
     JCSIM_PID="$!"
     sleep 2
-    CUID='f860203a257128'
+    CUID='fff860203a257128'
     KEY='4173f37fbec4f93f3c66bb9fbf7284bf'
     SALT='ead73d4e5aeb64b0ddb26b470bb85856'
-    opensc-tool -r 'Virtual PCD 00 00' -s "80 b8 00 00 33  07  D2760000850101  00  29  0800 $CUID $KEY $SALT FF"
+    opensc-tool -r 'Virtual PCD 00 00' -s "80 b8 00 00 34  07  D2760000850101  00  2A  0800 $CUID $KEY $SALT FF"
 }
 
 teardown() {
diff --git a/scripts/test/apex-spark.bats b/scripts/test/apex-spark.bats
@@ -15,8 +15,9 @@ setup() {
     java -cp /app/tools/jcardsim/target/jcardsim-3.0.5-SNAPSHOT.jar:./target com.licel.jcardsim.remote.VSmartCard /app/src/scripts/test/res/apex-spark.jcardsim.cfg > /dev/null &
     JCSIM_PID="$!"
     sleep 2
+    CUID='fff860203a257128'
     KEY='20f780716ba49ae163bd638486c71723'
-    opensc-tool -r 'Virtual PCD 00 00' -s "80 b8 00 00 1F  0C A000000846737061726B3201 00 10 $KEY FF"
+    opensc-tool -r 'Virtual PCD 00 00' -s "80 b8 00 00 27  0C A000000846737061726B3201 00 18 $CUID $KEY FF"
 }
 
 teardown() {
