Merge pull request #15 from mrautio/feature/fix-emv-card-simulator

feature/fix emv card simulator
mrautio · Jul 24, 2023 · 7888214 · 7888214
2 parents 253349e + 7939e05
commit 7888214
Show file tree

Hide file tree

Showing 8 changed files with 520 additions and 471 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,14 @@
-FROM alpine:edge
+FROM alpine:latest
 
 WORKDIR /tmp
 
-# JDK8 is best supported by different JavaCard versions
-RUN apk add --no-cache bash openjdk8 gcc make pkgconfig openssl-dev rust cargo gradle>6.0.0 && cargo install cargo-audit
+RUN apk add --no-cache bash gcc make pkgconfig openssl-dev rust cargo gradle>6.0.0 openjdk8=8.372.07-r0
+
+# JDK8 is best supported by different JavaCard versions (<=3.0.4)
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk/
+ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/bin
+ENV JAVA_VERSION 8u372
+ENV JAVA_ALPINE_VERSION 8.372.07-r0
 
 COPY oracle_javacard_sdks ./oracle_javacard_sdks
 COPY build.gradle gradle.properties ./

diff --git a/build.gradle b/build.gradle
@@ -65,14 +65,6 @@ if (System.properties['os.name'].toLowerCase().contains('windows')) {
     ext.cmd_shell_option = "/c"
 }
 
-task auditSimulatorLibrary(type: Exec) {
-    group "Verification"
-    description "Audit rust dependencies"
-    workingDir 'src/test/rust/simulator'
-
-    commandLine "${cmd_shell}", "${cmd_shell_option}", 'cargo audit'
-}
-
 task buildSimulatorLibrary(type: Exec) {
     group "Build"
     description "Build Rust simulator library"

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.1.xsd">
+<verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.2.xsd">
    <configuration>
       <verify-metadata>false</verify-metadata>
       <verify-signatures>false</verify-signatures>
@@ -218,6 +218,11 @@
             <sha512 value="b09a0ebef9493fc28c191c76ec9d7b5a1f3ce4adc6ff5aa8e41baf5b150dfaa7dfda0ea8da8c969a64a6cdf004760fc56aec5d9f20e3c059f85af00c6a01cbfa" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.klinec" name="jcardsim" version="3.0.6.0">
+         <artifact name="jcardsim-3.0.6.0.jar">
+            <sha512 value="65c697a86c3104ceb2a047918f5b4313817351050fea115c841ca807610b0b33610b526ef8d234905a318d7c767c3cf41c20bcd27e52a4adad12689ab365bad1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.payneteasy" name="ber-tlv" version="1.0-8">
          <artifact name="ber-tlv-1.0-8.jar">
             <sha512 value="8eef6cdfbce969ea8a99a15513be075cdabbe65a4f14d5bafdde784a09d55e514428cca53ab087f87a348ee7fc3e6112a3fb461ac80bcfa6414bd0aedc44208a" origin="Generated by Gradle"/>
@@ -666,6 +671,11 @@
             <sha512 value="67085f6ddab371aca1fb092061b5d0525200c39ffb33ab252a4866e23c6ed7ac2fc4c0271d6a4283de57312500cb53ebe3470b46db87cfe4e4b5bb8bb9754a2b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.10.0">
+         <artifact name="junit-jupiter-api-5.10.0.jar">
+            <sha512 value="440d7376673ed8e8ea84ce9f10e089f417c93a4f7044d23443588fbfa96cf74492ab26597fd9955537ce0e3190448062cfeadd428cb0de8522f81ccf3faa6353" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.7.0">
          <artifact name="junit-jupiter-api-5.7.0.jar">
             <sha512 value="b5551a908ccca41418ea2502d29840d302e8d64ec9f6ff1aeba316568e6ad357dd33a7973d28d836796cf40be304afc7b362bc5ad7eed1fdb638d43c8969a93b" origin="Generated by Gradle"/>
@@ -686,6 +696,11 @@
             <sha512 value="9785c7bb2c3e65de7d3647e7760438a18a10515dd3fae46076b0fa7b29b00d1466ca91572b6c806d41f60dd74698d0cd4fbb223dc85d7a6c4ad7faf140b1a5a9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.10.0">
+         <artifact name="junit-jupiter-engine-5.10.0.jar">
+            <sha512 value="35c6c38b155b568a1315b6f88e28d1940c69df807f9227fec0b54ad98688ccbd4c6020092d3d7fa889f74a708df82fce3733788bdcbad62eaac0f557e567d708" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.7.0">
          <artifact name="junit-jupiter-engine-5.7.0.jar">
             <sha512 value="4e7b36de3296a91639bfdeaecad7dd38eecd5ea5eccbf430a631f7ae5ef6556b33d141d375022bec0a5bcfa665e332f3f11fcd6c8dd513ac39f4b19e5ec2392a" origin="Generated by Gradle"/>
@@ -706,6 +721,11 @@
             <sha512 value="c1b67264ecb7d806a954b80d9836e52c9fd9382eea5f0f564be83b75fee01ad030060dd1508e52efd533b799fe8eea3504166ecffe9d8c8c2aa6d14404c9264d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.platform" name="junit-platform-commons" version="1.10.0">
+         <artifact name="junit-platform-commons-1.10.0.jar">
+            <sha512 value="51496111e3d0d1f27c3cee09bbfed9a9eb7d94b7bd12cbb39fddb5e64e6ba77e26cf89a8bd96d85bfe9fd39bd3db1c108aecad8c609e24ea6da3f4945353ca10" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.platform" name="junit-platform-commons" version="1.7.0">
          <artifact name="junit-platform-commons-1.7.0.jar">
             <sha512 value="29c4d465590b178848f4604297a5ad287005db61b4a4f48c53510e8ddfebc9437790b4715c48f800a26d93c722e9f1d5ac38445ee80787f5aa2b386690544749" origin="Generated by Gradle"/>
@@ -726,6 +746,11 @@
             <sha512 value="750576c1887d1e3595e538ade132f58e510ce225e41cb12a8d3e264b8fd2c37bbc3d089d5ee0aa918d97797fc606ac5b337b6c99c631718a3c5f16ebcd2e8715" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.platform" name="junit-platform-engine" version="1.10.0">
+         <artifact name="junit-platform-engine-1.10.0.jar">
+            <sha512 value="499e25e1920d73fea8f4e21a45ca0f3fc44561aa2589882bc29bb9bf212566b84ea704ea32ae5266da344c25b07dc23c3201587caf72508da2383b6f0848573b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.platform" name="junit-platform-engine" version="1.7.0">
          <artifact name="junit-platform-engine-1.7.0.jar">
             <sha512 value="f60f7f76beb969eb613f61c2477fa934168d79985b447b0605e07722c61a95dbd0212b9a30f9e876653ef39f5d3b097d4585340a3d9714e56d56bc03c1690a1b" origin="Generated by Gradle"/>
@@ -762,6 +787,36 @@
             <sha512 value="28ce0d0b5cceeac5adfcdd16ee6f5fbefd43eef8057b924993fb7a9f4b7a7085b980f3e808db5fb7750a53d0072b7fe7b118f5c0011e3ef0efe6c9a90a87b868" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.opentest4j" name="opentest4j" version="1.3.0">
+         <artifact name="opentest4j-1.3.0.jar">
+            <sha512 value="78fc698a7871bb50305e3657893c10500595f043348d875f57bc39ca4a6a51eda3967b7c8c8a7ec3e8f85f2171bca4aa98823e912e416e87e81c6ba5b70a37c3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm" version="7.2">
+         <artifact name="asm-7.2.jar">
+            <sha512 value="d66f38c87d919a003de399358fd95d6f2b7c6058bf152799b003ee62c9c4c3b155a7b577018a9b939f8c914a7c90b984d57aa3a22cda78390dd969fe81854eeb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-analysis" version="7.2">
+         <artifact name="asm-analysis-7.2.jar">
+            <sha512 value="2d9b728746cb5a656bc757242b1ea343280efb26a539b99eefaaefafcd38362ea8f60e9bb26e0f52d3ccfca015e5a8b62caf8ceaf47f3076b30db50b01412339" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-commons" version="7.2">
+         <artifact name="asm-commons-7.2.jar">
+            <sha512 value="d930e44821793b3e987259ef92056f43b2d5588fc077bafcea7dd641b3967f844d19d506e016558d1239ce0575bea658bf43762df7dba807d2765333e81ebfc5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-tree" version="7.2">
+         <artifact name="asm-tree-7.2.jar">
+            <sha512 value="39a40317bb096681a2b0901911bb9e6ebb1ee860afdee3c7f8b2863b98964cbaa4bf4b278c592edf7844e855b025ec9d9ce17c38c0541de726c99d36628b8675" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-util" version="7.2">
+         <artifact name="asm-util-7.2.jar">
+            <sha512 value="ba64d0a897febfac85f4e2321804a6059e033cf4f888a03baa7b9c0f7fdc4ed0819dce2e4c9dc2384664579d74fcd66cf84bdfc9936c35d111dba049d7cc848f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.slf4j" name="slf4j-api" version="1.7.25">
          <artifact name="slf4j-api-1.7.25.jar">
             <sha512 value="5dd6271fd5b34579d8e66271bab75c89baca8b2ebeaa9966de391284bd08f2d720083c6e0e1edda106ecf8a04e9a32116de6873f0f88c19c049c0fe27e5d820b" origin="Generated by Gradle"/>