use fido-attestation-loader for CI

Author: StarGate01

scripts/compile/res/u2f-javacard.build.xml

@@ -1,10 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="applet" name="ledger-u2f-javacard">
-  <target name="applet">
+<project basedir="." default="build" name="ledger-u2f-javacard">
+
+  <target name="build" description="Build everything">
+    <antcall target="build-applet-ci"/>
+    <antcall target="build-applet"/>
+  </target>
+
+  <target name="build-applet">
+    <get src="https://github.com/martinpaljak/ant-javacard/releases/download/v1.4/ant-javacard.jar" skipexisting="true" dest="."/>
+    <taskdef name="javacard" classname="pro.javacard.ant.JavaCard" classpath="ant-javacard.jar"/>
+    <replaceregexp file="src/main/java/com/ledger/u2f/OneShotPresence.java" match="(if \(did_verify_flag\[0\] != 0\)\s*\{\n\s*return\s)\s*[A-z0-9]*;" replace="\10;"/>
+    <javacard>
+      <cap output="target/U2FApplet.cap" classes="target/applet" sources="src" aid="a000000617004f97a2e95001" version="1.1">
+        <applet class="com.ledger.u2f.U2FApplet" aid="a000000617004f97a2e94901"/>
+      </cap>
+    </javacard>
+  </target>
+
+  <target name="build-applet-ci">
     <get src="https://github.com/martinpaljak/ant-javacard/releases/download/v1.4/ant-javacard.jar" skipexisting="true" dest="."/>
     <taskdef name="javacard" classname="pro.javacard.ant.JavaCard" classpath="ant-javacard.jar"/>
+    <replaceregexp file="src/main/java/com/ledger/u2f/OneShotPresence.java" match="(if \(did_verify_flag\[0\] != 0\)\s*\{\n\s*return\s)\s*[A-z0-9]*;" replace="\1FLAG_USER_PRESENT;"/>
     <javacard>
-      <cap output="target/U2FApplet.cap" classes="target" sources="src" aid="a000000617004f97a2e95001" version="1.1">
+      <cap output="target/U2FApplet-ci.cap" classes="target/applet-ci" sources="src" aid="a000000617004f97a2e95001" version="1.1">
         <applet class="com.ledger.u2f.U2FApplet" aid="a000000617004f97a2e94901"/>
       </cap>
     </javacard>

scripts/compile/u2f-javacard.sh

@@ -4,4 +4,4 @@ mkdir -p /app/src/bin /app/src/applets/u2f-javacard/target
 cd /app/src/applets/u2f-javacard
 cp /app/src/scripts/compile/res/u2f-javacard.build.xml .
 JC_HOME=/app/sdks/jc304_kit ant -buildfile u2f-javacard.build.xml
-cp /app/src/applets/u2f-javacard/target/*.cap /app/src/bin/
+cp /app/src/applets/u2f-javacard/target/U2FApplet.cap /app/src/bin/

scripts/test/u2f-javacard.bats

@@ -12,15 +12,15 @@ teardown_file() {
 
 setup() {
     cd /app/src/applets/u2f-javacard
-    java -cp /app/tools/jcardsim/target/jcardsim-3.0.5-SNAPSHOT.jar:./target com.licel.jcardsim.remote.VSmartCard /app/src/scripts/test/res/u2f-javacard.jcardsim.cfg > /dev/null &
+    java -cp /app/tools/jcardsim/target/jcardsim-3.0.5-SNAPSHOT.jar:./target/applet-ci com.licel.jcardsim.remote.VSmartCard /app/src/scripts/test/res/u2f-javacard.jcardsim.cfg > /dev/null &
     JCSIM_PID="$!"
     sleep 2
-    opensc-tool -r 'Virtual PCD 00 00' -s '80 b8 00 00 2F  08  A0 00 00 06 47 2F 00 01  00  23  01 01 40 f3 fc cc 0d 00 d8 03 19 54 f9 08 64 d4 3c 24 7f 4b f5 f0 66 5c 6b 50 cc 17 74 9a 27 d1 cf 76 64  FF'
-    opensc-tool -r 'Virtual PCD 00 00' \
-        -s '00 A4 04 00 08 A0 00 00 06 47 2F 00 01' \
-        -s '80 01 00 00 80 30 82 01 3c 30 81 e4 a0 03 02 01 02 02 0a 47 90 12 80 00 11 55 95 73 52 30 0a 06 08 2a 86 48 ce 3d 04 03 02 30 17 31 15 30 13 06 03 55 04 03 13 0c 47 6e 75 62 62 79 20 50 69 6c 6f 74 30 1e 17 0d 31 32 30 38 31 34 31 38 32 39 33 32 5a 17 0d 31 33 30 38 31 34 31 38 32 39 33 32 5a 30 31 31 2f 30 2d 06 03 55 04 03 13 26 50 69 6c 6f 74 47 6e 75 62 62 79 2d 30 2e 34 2e 31 2d 34 37 39 30' \
-        -s '80 01 00 80 80 31 32 38 30 30 30 31 31 35 35 39 35 37 33 35 32 30 59 30 13 06 07 2a 86 48 ce 3d 02 01 06 08 2a 86 48 ce 3d 03 01 07 03 42 00 04 8d 61 7e 65 c9 50 8e 64 bc c5 67 3a c8 2a 67 99 da 3c 14 46 68 2c 25 8c 46 3f ff df 58 df d2 fa 3e 6c 37 8b 53 d7 95 c4 a4 df fb 41 99 ed d7 86 2f 23 ab af 02 03 b4 b8 91 1b a0 56 99 94 e1 01 30 0a 06 08 2a 86 48 ce 3d 04 03 02 03 47 00 30 44 02 20 60 cd' \
-        -s '80 01 01 00 40 b6 06 1e 9c 22 26 2d 1a ac 1d 96 d8 c7 08 29 b2 36 65 31 dd a2 68 83 2c b8 36 bc d3 0d fa 02 20 63 1b 14 59 f0 9e 63 30 05 57 22 c8 d8 9b 7f 48 88 3b 90 89 b8 8d 60 d1 d9 79 59 02 b3 04 10 df'
+    cd /app/tools/fido-attestation-loader
+    ./attestation.py ca create -cap 123456
+    ./attestation.py cert create -p 1234 -cap 123456
+    PARAM=`./attestation.py cert show -ao -p 1234`
+    opensc-tool -r 'Virtual PCD 00 00' -s "80 b8 00 00 2F  08  A0 00 00 06 47 2F 00 01  00  23 $PARAM FF"
+    ./attestation.py cert upload
 }
 
 teardown() {