Integration of vk-u2f

StarGate01 · StarGate01 · commit a93d83511b8c · 2022-08-08T04:43:41.000+02:00
diff --git a/applets/javacard-memory b/applets/javacard-memory
@@ -1 +1 @@
-Subproject commit fbe93d4269d17b73d4cd49c6f135b6df075cf866
+Subproject commit 7b0648f4ac81990d5f5f39e6cbf3dc30f35ac6ca
diff --git a/applets/vk-u2f b/applets/vk-u2f
@@ -1 +1 @@
-Subproject commit 62feb5124f2578d4852e854b6324700eaf0df577
+Subproject commit a854c4fb088f75651ef6c8d2fcfa370d1e186eb7
diff --git a/scripts/clean/vk-u2f.sh b/scripts/clean/vk-u2f.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cd /app/src/applets/vk-u2f
-rm -rf target/*.cap target/com/vivokey/u2f
+rm -rf target
diff --git a/scripts/clean/vk-ykhmac.sh b/scripts/clean/vk-ykhmac.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cd /app/src/applets/vk-ykhmac
-rm -rf target/*.cap target/com/vivokey/ykhmac
+rm -rf target
diff --git a/scripts/compile/res/u2f-javacard.build.xml b/scripts/compile/res/u2f-javacard.build.xml
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<project basedir="." default="applet" name="ledger-u2f-javacard">
+  <target name="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="\1FLAG_USER_PRESENT;"/>
     <javacard>
-      <cap output="target/U2FApplet-ci.cap" classes="target/applet-ci" sources="src" aid="a000000617004f97a2e95001" version="1.1">
+      <cap output="target/U2FApplet.cap" classes="target" sources="src" aid="a000000617004f97a2e95001" version="1.1">
         <applet class="com.ledger.u2f.U2FApplet" aid="a000000617004f97a2e94901"/>
       </cap>
     </javacard>
diff --git a/scripts/compile/res/vk-u2f.build.xml b/scripts/compile/res/vk-u2f.build.xml
diff --git a/scripts/compile/u2f-javacard.sh b/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/U2FApplet.cap /app/src/bin/
+cp /app/src/applets/u2f-javacard/target/*.cap /app/src/bin/
diff --git a/scripts/compile/vk-u2f.sh b/scripts/compile/vk-u2f.sh
@@ -2,6 +2,5 @@
 
 mkdir -p /app/src/bin /app/src/applets/vk-u2f/target
 cd /app/src/applets/vk-u2f
-cp /app/src/scripts/compile/res/vk-u2f.build.xml .
-JC_HOME=/app/sdks/jc304_kit ant -buildfile vk-u2f.build.xml
+JC_HOME=/app/sdks/jc304_kit ant
 cp /app/src/applets/vk-u2f/target/*.cap /app/src/bin/
diff --git a/scripts/jcardsim.sh b/scripts/jcardsim.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd /app/src/jcardsim
+JC_CLASSIC_HOME=/app/sdks/jc305u3_kit/ mvn initialize
+JC_CLASSIC_HOME=/app/sdks/jc305u3_kit/ mvn clean install
diff --git a/scripts/test/res/certs/.gitignore b/scripts/test/res/certs/.gitignore
diff --git a/scripts/test/res/certs/attestation.config b/scripts/test/res/certs/attestation.config
diff --git a/scripts/test/res/certs/attestation.sh b/scripts/test/res/certs/attestation.sh
diff --git a/scripts/test/res/vk-u2f.jcardsim.cfg b/scripts/test/res/vk-u2f.jcardsim.cfg
@@ -0,0 +1,5 @@
+com.licel.jcardsim.card.applet.0.AID=A0000006472F0001
+com.licel.jcardsim.card.applet.0.Class=com.vivokey.u2f.CTAP2
+com.licel.jcardsim.card.ATR=3BF91800FF8131FE4550565F4A334130343040
+com.licel.jcardsim.vsmartcard.host=localhost
+com.licel.jcardsim.vsmartcard.port=35963
diff --git a/scripts/test/u2f-javacard.bats b/scripts/test/u2f-javacard.bats
@@ -12,13 +12,13 @@ teardown_file() {
 
 setup() {
     cd /app/src/applets/u2f-javacard
-    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 &
+    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 &
     JCSIM_PID="$!"
     sleep 2
     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`
+    PARAM=`./attestation.py cert show -ao -p 1234 -m u2fci`
     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
 }
diff --git a/scripts/test/vk-u2f.bats b/scripts/test/vk-u2f.bats
@@ -0,0 +1,35 @@
+#!/usr/bin/env bats
+
+load res/common.sh
+
+setup_file() {
+    _setup_file
+}
+
+teardown_file() {
+    _teardown_file
+}
+
+setup() {
+    cd /app/src/applets/vk-u2f
+    java -cp /app/src/jcardsim/target/jcardsim-3.0.5-SNAPSHOT.jar:./target com.licel.jcardsim.remote.VSmartCard /app/src/scripts/test/res/vk-u2f.jcardsim.cfg 1>&3 2>&3  & # > /dev/null &
+    JCSIM_PID="$!"
+    sleep 2
+    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 -m fido2`
+    # opensc-tool -r 'Virtual PCD 00 00' -s "80 b8 00 00 3F  08  A0 00 00 06 47 2F 00 01  00  33 $PARAM FF" 1>&3 2>&3
+    # ./attestation.py cert upload -m fido2
+}
+
+teardown() {
+    _teardown
+}
+
+
+#@test "U2F Register and Authenticate https://demo.yubico.com/" {
+#    RES=`fido2-webauthn-client "pcsc://slot0" 2>&1 | sed -n -e '/http_response_json: https:\/\/demo\.yubico\.com\/api\/v1\/simple\/webauthn\/authenticate-finish/,$p' | sed 1d`
+#    STATUS=`echo $RES | jq -r '.status'`
+#    [ "$STATUS" == "success" ]
+#}
diff --git a/smartcard-ci b/smartcard-ci
@@ -1 +1 @@
-Subproject commit 608a4c7851af1e286c3a5c28036f7a9d8cb655a4
+Subproject commit 9776b527fae97921dd5087af3f31c7e7334dfdd5
