diff --git a/Dockerfile b/Dockerfile index 438a3c1..3692108 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,13 +2,14 @@ FROM alpine:latest WORKDIR /tmp -RUN apk add --no-cache bash gcc make pkgconfig openssl-dev rust cargo gradle>6.0.0 openjdk8=8.372.07-r0 +RUN apk add --no-cache bash gcc make pkgconfig openssl-dev rust cargo gradle openjdk8 # JDK8 is best supported by different JavaCard versions (<=3.0.4) +# Configure version based on alpine:latest version info: https://pkgs.alpinelinux.org/packages?name=openjdk8&branch=&repo=&arch=&maintainer= 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 +ENV JAVA_VERSION 8u392 +ENV JAVA_ALPINE_VERSION 8.392.08-r1 COPY oracle_javacard_sdks ./oracle_javacard_sdks COPY build.gradle gradle.properties ./ diff --git a/gradle.lockfile b/gradle.lockfile index 57d9466..3f077b7 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -20,10 +20,10 @@ org.antlr:antlr4-runtime:4.7.2=checkstyle org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:2.8.1=checkstyle org.codehaus.mojo:animal-sniffer-annotations:1.18=checkstyle -org.junit.jupiter:junit-jupiter-api:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.9.1=testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.1=testRuntimeClasspath -org.junit:junit-bom:5.9.1=testCompileClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.10.1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.10.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.10.1=testRuntimeClasspath +org.junit:junit-bom:5.10.1=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath empty=annotationProcessor,testAnnotationProcessor diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index c85f359..828f9bc 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -676,6 +676,11 @@ + + + + + @@ -701,6 +706,11 @@ + + + + + @@ -726,6 +736,11 @@ + + + + + @@ -751,6 +766,11 @@ + + + + + diff --git a/nix/sources.json b/nix/sources.json index b95ac58..8e5f17c 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,22 +5,22 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "914aba08a26cb10538b84d00d6cfb01c9776d80c", - "sha256": "0gx316gc7prjay5b0cr13x4zc2pdbiwxkfkpjvrlb2rml80lm4pm", + "rev": "6bd7cd686220bf3db0e212481faf9578e8c8ff0f", + "sha256": "15claxlj6y15db67qc7kb4vzyn6sv7r13z4q502vq7a4z2488z94", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/914aba08a26cb10538b84d00d6cfb01c9776d80c.tar.gz", + "url": "https://github.com/nmattia/niv/archive/6bd7cd686220bf3db0e212481faf9578e8c8ff0f.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "nixos-23.05", + "branch": "nixos-23.11", "description": "Nix Packages collection", "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9fdfaeb7b96f05e869f838c73cde8d98c640c649", - "sha256": "1dkpyv0cgbcrmfajbmsdfqlss6nsgs3bj3adfhvcf39pvz9f5p7g", + "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d", + "sha256": "1gcqpm7v42wfmq0wrl4dym9kg4y7n4f5wsgvisq52zr90vjvylwx", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/9fdfaeb7b96f05e869f838c73cde8d98c640c649.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/933d7dc155096e7575d207be6fb7792bc9f34f6d.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/src/main/java/emvcardsimulator/ApduLog.java b/src/main/java/emvcardsimulator/ApduLog.java index 7e8b5b0..85c8a8c 100644 --- a/src/main/java/emvcardsimulator/ApduLog.java +++ b/src/main/java/emvcardsimulator/ApduLog.java @@ -50,7 +50,7 @@ public static void addLogEntry(byte[] src, short srcOffset, byte length) { return; } - if (src[srcOffset] == (byte) 0xE0) { + if (src[srcOffset] == (byte) 0x80) { // do not log internal commands return; } diff --git a/src/main/java/emvcardsimulator/EmvApplet.java b/src/main/java/emvcardsimulator/EmvApplet.java index dc90555..9a7ab04 100644 --- a/src/main/java/emvcardsimulator/EmvApplet.java +++ b/src/main/java/emvcardsimulator/EmvApplet.java @@ -40,14 +40,14 @@ static void printEmvTags() { } */ - protected static final short CMD_SET_SETTINGS = (short) 0xE000; - protected static final short CMD_SET_EMV_TAG = (short) 0xE001; - protected static final short CMD_SET_EMV_TAG_FUZZ = (short) 0xE011; - protected static final short CMD_SET_TAG_TEMPLATE = (short) 0xE002; - protected static final short CMD_SET_READ_RECORD_TEMPLATE = (short) 0xE003; - protected static final short CMD_FACTORY_RESET = (short) 0xE005; - protected static final short CMD_LOG_CONSUME = (short) 0xE006; - protected static final short CMD_FUZZ_RESET = (short) 0xE007; + protected static final short CMD_SET_SETTINGS = (short) 0x8000; + protected static final short CMD_SET_EMV_TAG = (short) 0x8001; + protected static final short CMD_SET_EMV_TAG_FUZZ = (short) 0x8011; + protected static final short CMD_SET_TAG_TEMPLATE = (short) 0x8002; + protected static final short CMD_SET_READ_RECORD_TEMPLATE = (short) 0x8003; + protected static final short CMD_FACTORY_RESET = (short) 0x8005; + protected static final short CMD_LOG_CONSUME = (short) 0x8006; + protected static final short CMD_FUZZ_RESET = (short) 0x8007; protected static final short CMD_SELECT = (short) 0x00A4; protected static final short CMD_READ_RECORD = (short) 0x00B2; protected static final short CMD_DDA = (short) 0x0088; diff --git a/src/main/rust/cardtool/Cargo.lock b/src/main/rust/cardtool/Cargo.lock index 43119f4..4df02c6 100644 --- a/src/main/rust/cardtool/Cargo.lock +++ b/src/main/rust/cardtool/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -37,9 +37,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arc-swap" @@ -76,11 +76,17 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "cardtool" @@ -99,9 +105,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -111,17 +120,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -132,7 +140,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim", "textwrap", "unicode-width", @@ -141,9 +149,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "derivative" @@ -165,7 +173,7 @@ checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" [[package]] name = "emvpt" version = "0.1.0" -source = "git+https://github.com/mrautio/emvpt#47430c4980ffd41f5fb638321d7b87b676500c87" +source = "git+https://github.com/mrautio/emvpt#c285ab412220631ab3cbffc2e290b8975b9c64ee" dependencies = [ "asn1_der", "chrono", @@ -180,7 +188,7 @@ dependencies = [ "rand_chacha", "regex", "serde", - "serde_yaml 0.9.25", + "serde_yaml 0.9.27", ] [[package]] @@ -212,13 +220,13 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -229,9 +237,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hermit-abi" @@ -266,16 +274,16 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -299,12 +307,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.3", ] [[package]] @@ -324,18 +332,18 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] [[package]] name = "libc" -version = "0.2.147" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "linked-hash-map" @@ -345,9 +353,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -355,9 +363,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ "serde", ] @@ -396,15 +404,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -417,11 +425,11 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -438,14 +446,14 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.39", ] [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" dependencies = [ "cc", "libc", @@ -455,9 +463,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ "num-traits", ] @@ -474,13 +482,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", "windows-targets", ] @@ -491,7 +499,7 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37cab0be9d04e808a8d8059fa54befcd71dc8b168f9f0c04bdb7e59832abbab4" dependencies = [ - "bitflags", + "bitflags 1.3.2", "pcsc-sys", ] @@ -518,18 +526,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -566,27 +574,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -596,9 +595,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -607,9 +606,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "ryu" @@ -625,9 +624,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.175" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] @@ -644,20 +643,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.175" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -678,11 +677,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -691,9 +690,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "strsim" @@ -714,9 +713,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -743,43 +742,31 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.39", ] [[package]] name = "thread-id" -version = "4.1.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee93aa2b8331c0fec9091548843f2c90019571814057da3b783f9de09349d73" +checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b" dependencies = [ "libc", - "redox_syscall 0.2.16", - "winapi", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] @@ -794,15 +781,15 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unsafe-any-ors" @@ -837,12 +824,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -851,9 +832,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -861,24 +842,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -886,22 +867,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "winapi" @@ -935,19 +916,19 @@ dependencies = [ ] [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -960,45 +941,45 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "yaml-rust" diff --git a/src/main/rust/cardtool/Cargo.toml b/src/main/rust/cardtool/Cargo.toml index 34067c0..2167ea5 100644 --- a/src/main/rust/cardtool/Cargo.toml +++ b/src/main/rust/cardtool/Cargo.toml @@ -8,12 +8,12 @@ edition = "2018" [dependencies] emvpt = { git = "https://github.com/mrautio/emvpt", version = "0.1.0" } -log = "0.4.19" +log = "0.4.20" log4rs = "1.2.0" clap = "2.34.0" hex = "0.4.3" -serde = { version = "1.0.175", features = ["derive"] } +serde = { version = "1.0.193", features = ["derive"] } serde_yaml = "0.8.26" pcsc = "2.8.0" -regex = "1.9.1" +regex = "1.10.2" diff --git a/src/main/rust/config/card_setup_app_apdus-spankki.yaml b/src/main/rust/config/card_setup_app_apdus-spankki.yaml index 8488902..5db9177 100644 --- a/src/main/rust/config/card_setup_app_apdus-spankki.yaml +++ b/src/main/rust/config/card_setup_app_apdus-spankki.yaml @@ -5,14 +5,14 @@ - req: '00 A4 04 00 0E 31 50 41 59 2E 53 59 53 2E 44 44 46 30 31' res: '90 00' # "Factory reset" -- req: 'E0 05 00 00 00' +- req: '80 05 00 00 00' res: '90 00' # Setup tag templates -- req: 'E0 02 00 06 04 DF 02 DF 47' +- req: '80 02 00 06 04 DF 02 DF 47' res: '90 00' -- req: 'E0 02 00 05 08 00 88 5F 2D 9F 11 BF 0C' +- req: '80 02 00 05 08 00 88 5F 2D 9F 11 BF 0C' res: '90 00' -- req: 'E0 02 00 04 04 00 84 00 A5' +- req: '80 02 00 04 04 00 84 00 A5' res: '90 00' # Setup READ RECORD tag templates #00000000 6F 2A 84 0E 31 50 41 59 2E 53 59 53 2E 44 44 46 | o*ä♫1PAY.SYS.DDF | @@ -29,177 +29,177 @@ #70 49 61 1A 4F 08 A0 00 00 00 03 10 10 01 50 0B 56 49 53 41 20 43 52 45 44 49 54 87 01 01 61 19 4F 08 A0 00 00 00 03 10 10 02 50 0A 56 49 53 41 20 44 45 42 49 54 87 01 02 61 10 4F 07 A0 00 00 03 79 00 00 50 05 42 4F 4E 55 53 # 61 2E (dummy) <-> 61 2F (s-pankki) -#- req: 'E0 03 01 0C 30 61 2F 4F 08 A0 00 00 00 03 10 10 01 50 0D 56 49 53 41 20 45 4C 45 43 54 52 4F 4E 9F 12 10 56 49 53 41 20 20 20 20 20 20 20 20 20 20 20 20 87 01 01' +#- req: '80 03 01 0C 30 61 2F 4F 08 A0 00 00 00 03 10 10 01 50 0D 56 49 53 41 20 45 4C 45 43 54 52 4F 4E 9F 12 10 56 49 53 41 20 20 20 20 20 20 20 20 20 20 20 20 87 01 01' # res: '90 00' -- req: 'E0 03 01 0C 30 61 2E 4F 08 A0 00 00 00 03 10 10 01 0D 56 45 53 41 20 45 4C 45 43 54 52 4F 4E 9F 12 10 56 45 53 41 20 20 20 20 20 20 20 20 20 20 20 20 87 01 01' +- req: '80 03 01 0C 30 61 2E 4F 08 A0 00 00 00 03 10 10 01 0D 56 45 53 41 20 45 4C 45 43 54 52 4F 4E 9F 12 10 56 45 53 41 20 20 20 20 20 20 20 20 20 20 20 20 87 01 01' res: '90 00' -#- req: 'E0 03 01 0C 30 61 2F 4F 08 A0 00 00 00 03 10 10 01 50 0D 56 49 53 41 20 45 4C 45 43 54 52 4F 4E 9F 12 10 56 49 53 41 20 20 20 20 20 20 20 20 20 20 20 20 87 01 01' +#- req: '80 03 01 0C 30 61 2F 4F 08 A0 00 00 00 03 10 10 01 50 0D 56 49 53 41 20 45 4C 45 43 54 52 4F 4E 9F 12 10 56 49 53 41 20 20 20 20 20 20 20 20 20 20 20 20 87 01 01' # res: '90 00' # Setup ICC EMV tags -- req: 'E0 01 DF 02 02 02 46' +- req: '80 01 DF 02 02 02 46' res: '90 00' -- req: 'E0 01 DF 47 03 80 01 01' +- req: '80 01 DF 47 03 80 01 01' res: '90 00' -- req: 'E0 01 9F 11 01 01' +- req: '80 01 9F 11 01 01' res: '90 00' -- req: 'E0 01 5F 2D 02 65 6E' +- req: '80 01 5F 2D 02 65 6E' res: '90 00' -- req: 'E0 01 00 88 01 01' +- req: '80 01 00 88 01 01' res: '90 00' -- req: 'E0 01 00 84 0E 31 50 41 59 2E 53 59 53 2E 44 44 46 30 31' +- req: '80 01 00 84 0E 31 50 41 59 2E 53 59 53 2E 44 44 46 30 31' res: '90 00' # Select paymentapp AID - req: '00 A4 04 00 08 A0 00 00 00 03 10 10 01' res: '90 00' # res: '69 84' # "Factory reset" -- req: 'E0 05 00 00 00' +- req: '80 05 00 00 00' res: '90 00' # Setup settings # ICC RSA Key = icc_1234560012345608_e_3_private_key.pem # ICC RSA Key modulus -- req: 'E0 00 00 04 80 C0 C3 22 9F B5 DA 18 D0 71 84 16 DD 70 C4 95 B1 49 5A 18 38 B7 A1 D6 AF F2 C0 78 AB F2 4D 30 73 C0 CB F1 F8 FB 7D 7C 4E EF 92 5E 00 C3 57 B0 9D D2 ED 29 6B 15 89 8C C0 2A 0A 68 BE AE B5 96 AE DF 7E 5D 7A F7 71 8F 48 E4 D4 B0 1B 53 FC 44 4E B5 81 2D 3E 3B C1 86 93 8D 71 1A 89 29 6D 80 AA 4E D3 49 B2 6A FD E3 C1 07 22 1B 98 E8 0B EB 60 4D 99 F0 98 5D 43 48 D4 A7 D9 1A DE A0 97 1B FD' +- req: '80 00 00 04 80 C0 C3 22 9F B5 DA 18 D0 71 84 16 DD 70 C4 95 B1 49 5A 18 38 B7 A1 D6 AF F2 C0 78 AB F2 4D 30 73 C0 CB F1 F8 FB 7D 7C 4E EF 92 5E 00 C3 57 B0 9D D2 ED 29 6B 15 89 8C C0 2A 0A 68 BE AE B5 96 AE DF 7E 5D 7A F7 71 8F 48 E4 D4 B0 1B 53 FC 44 4E B5 81 2D 3E 3B C1 86 93 8D 71 1A 89 29 6D 80 AA 4E D3 49 B2 6A FD E3 C1 07 22 1B 98 E8 0B EB 60 4D 99 F0 98 5D 43 48 D4 A7 D9 1A DE A0 97 1B FD' res: '90 00' # ICC RSA Key private exponent -- req: 'E0 00 00 05 80 80 82 17 15 23 E6 BB 35 A1 02 B9 E8 F5 D8 63 CB 86 3C 10 25 CF C1 39 CA A1 D5 A5 C7 F6 DE 20 4D 2B 32 A1 50 A7 A8 FD 89 F5 0C 3E AB 2C E5 20 69 37 48 C6 47 63 B1 08 80 1C 06 F0 7F 1F 23 B9 C8 C1 EB B7 49 BA 7C BC 99 C3 50 7F 7B 52 A8 49 B1 AA 10 1D 8B FE 2D 59 D2 84 08 F2 B6 56 27 5B B4 84 5B 09 91 43 34 5F 69 94 A5 ED 97 AB 7A FF 3A A3 B1 05 21 4A 9F 8F 8A 6C 01 B4 3F 6E 38 8D AB' +- req: '80 00 00 05 80 80 82 17 15 23 E6 BB 35 A1 02 B9 E8 F5 D8 63 CB 86 3C 10 25 CF C1 39 CA A1 D5 A5 C7 F6 DE 20 4D 2B 32 A1 50 A7 A8 FD 89 F5 0C 3E AB 2C E5 20 69 37 48 C6 47 63 B1 08 80 1C 06 F0 7F 1F 23 B9 C8 C1 EB B7 49 BA 7C BC 99 C3 50 7F 7B 52 A8 49 B1 AA 10 1D 8B FE 2D 59 D2 84 08 F2 B6 56 27 5B B4 84 5B 09 91 43 34 5F 69 94 A5 ED 97 AB 7A FF 3A A3 B1 05 21 4A 9F 8F 8A 6C 01 B4 3F 6E 38 8D AB' res: '90 00' # Pin code -- req: 'E0 00 00 01 02 07 44' +- req: '80 00 00 01 02 07 44' res: '90 00' # Use response template 2 (tag 77) -- req: 'E0 00 00 02 02 00 80' +- req: '80 00 00 02 02 00 80' res: '90 00' # Setup tag templates -- req: 'E0 02 00 01 04 00 82 00 94' +- req: '80 02 00 01 04 00 82 00 94' res: '90 00' -- req: 'E0 02 00 02 02 9F 4B' +- req: '80 02 00 02 02 9F 4B' res: '90 00' -- req: 'E0 02 00 03 08 9F 27 9F 36 9F 26 9F 10' +- req: '80 02 00 03 08 9F 27 9F 36 9F 26 9F 10' res: '90 00' -- req: 'E0 02 00 04 04 00 84 00 A5' +- req: '80 02 00 04 04 00 84 00 A5' res: '90 00' -- req: 'E0 02 00 05 06 00 50 00 87 5F 2D' +- req: '80 02 00 05 06 00 50 00 87 5F 2D' res: '90 00' # Setup READ RECORD tag templates -- req: 'E0 03 01 0C 06 00 57 5F 20 9F 1F' +- req: '80 03 01 0C 06 00 57 5F 20 9F 1F' res: '90 00' -- req: 'E0 03 01 14 02 00 90' +- req: '80 03 01 14 02 00 90' res: '90 00' -- req: 'E0 03 02 14 08 00 8F 9F 32 00 92 9F 47' +- req: '80 03 02 14 08 00 8F 9F 32 00 92 9F 47' res: '90 00' -- req: 'E0 03 03 14 02 9F 46' +- req: '80 03 03 14 02 9F 46' res: '90 00' -- req: 'E0 03 01 1C 1A 5F 25 5F 24 00 5A 5F 34 9F 07 00 8E 9F 0D 9F 0E 9F 0F 9F 4A 00 8C 00 8D 5F 28' +- req: '80 03 01 1C 1A 5F 25 5F 24 00 5A 5F 34 9F 07 00 8E 9F 0D 9F 0E 9F 0F 9F 4A 00 8C 00 8D 5F 28' res: '90 00' -- req: 'E0 03 02 1C 08 9F 42 9F 44 9F 49 9F 08' +- req: '80 03 02 1C 08 9F 42 9F 44 9F 49 9F 08' res: '90 00' -#- req: 'E0 03 02 0C 06 00 57 5F 20 9F 1F' +#- req: '80 03 02 0C 06 00 57 5F 20 9F 1F' # res: '90 00' -#- req: 'E0 03 01 14 06 9F 46 9F 47 9F 49' +#- req: '80 03 01 14 06 9F 46 9F 47 9F 49' # res: '90 00' -#- req: 'E0 03 02 14 08 00 8F 9F 32 00 92 00 90' +#- req: '80 03 02 14 08 00 8F 9F 32 00 92 00 90' # res: '90 00' -#- req: 'E0 03 01 1C 14 5F 24 00 5A 5F 34 9F 07 00 8E 9F 0D 9F 0E 9F 0F 5F 28 9F 4A' +#- req: '80 03 01 1C 14 5F 24 00 5A 5F 34 9F 07 00 8E 9F 0D 9F 0E 9F 0F 5F 28 9F 4A' # res: '90 00' -#- req: 'E0 03 02 1C 0A 9F 42 9F 44 9F 08 00 8C 00 8D' +#- req: '80 03 02 1C 0A 9F 42 9F 44 9F 08 00 8C 00 8D' # res: '90 00' # Setup ICC EMV tags -- req: 'E0 01 5F 28 02 02 46' +- req: '80 01 5F 28 02 02 46' res: '90 00' -- req: 'E0 01 9F 07 02 FF 00' +- req: '80 01 9F 07 02 FF 00' res: '90 00' -- req: 'E0 01 9F 4B 80 55 12 44 1B F2 E8 AE 19 41 CE AB 2A 0F C9 15 AA 42 C4 A2 AD 64 1F 34 B4 48 94 E0 8E 84 90 5C 33 23 B2 AE 6C D3 88 8E 4C D0 BC 3B 8E 38 02 7F 01 3F FE 45 31 F7 57 39 4A 55 9C 04 1A 90 22 40 BC 8A E4 8F 54 39 53 0F 88 E0 C4 A8 3C 35 17 22 85 0C 41 8B ED D5 04 47 43 7F B5 7E 60 67 9D 48 5A 7F 00 FE FC DA AE CA 5A 2C A7 FF 61 11 91 C1 DC 83 72 10 6C 78 2F D2 83 B0 AF 1D 32 0C CB 8C BA' +- req: '80 01 9F 4B 80 55 12 44 1B F2 E8 AE 19 41 CE AB 2A 0F C9 15 AA 42 C4 A2 AD 64 1F 34 B4 48 94 E0 8E 84 90 5C 33 23 B2 AE 6C D3 88 8E 4C D0 BC 3B 8E 38 02 7F 01 3F FE 45 31 F7 57 39 4A 55 9C 04 1A 90 22 40 BC 8A E4 8F 54 39 53 0F 88 E0 C4 A8 3C 35 17 22 85 0C 41 8B ED D5 04 47 43 7F B5 7E 60 67 9D 48 5A 7F 00 FE FC DA AE CA 5A 2C A7 FF 61 11 91 C1 DC 83 72 10 6C 78 2F D2 83 B0 AF 1D 32 0C CB 8C BA' res: '90 00' -- req: 'E0 01 9F 4C 02 00 37' +- req: '80 01 9F 4C 02 00 37' res: '90 00' -- req: 'E0 01 9F 10 07 06 01 0A 03 A4 90 02' +- req: '80 01 9F 10 07 06 01 0A 03 A4 90 02' res: '90 00' -- req: 'E0 01 9F 44 01 02' +- req: '80 01 9F 44 01 02' res: '90 00' -- req: 'E0 01 5F 34 01 00' +- req: '80 01 5F 34 01 00' res: '90 00' -- req: 'E0 01 9F 26 08 7C C6 D7 43 A5 9B CF CB' +- req: '80 01 9F 26 08 7C C6 D7 43 A5 9B CF CB' res: '90 00' -- req: 'E0 01 5F 25 03 14 06 01' +- req: '80 01 5F 25 03 14 06 01' res: '90 00' -- req: 'E0 01 9F 03 06 00 00 00 00 00 00' +- req: '80 01 9F 03 06 00 00 00 00 00 00' res: '90 00' -- req: 'E0 01 9F 32 01 03' +- req: '80 01 9F 32 01 03' res: '90 00' -- req: 'E0 01 5F 24 03 17 03 31' +- req: '80 01 5F 24 03 17 03 31' res: '90 00' -- req: 'E0 01 00 84 08 A0 00 00 00 03 10 10 01' +- req: '80 01 00 84 08 A0 00 00 00 03 10 10 01' res: '90 00' -- req: 'E0 01 00 8C 15 9F 02 06 9F 03 06 9F 1A 02 95 05 5F 2A 02 9A 03 9C 01 9F 37 04' +- req: '80 01 00 8C 15 9F 02 06 9F 03 06 9F 1A 02 95 05 5F 2A 02 9A 03 9C 01 9F 37 04' res: '90 00' -- req: 'E0 01 9F 08 02 00 96' +- req: '80 01 9F 08 02 00 96' res: '90 00' -- req: 'E0 01 5F 2A 02 09 78' +- req: '80 01 5F 2A 02 09 78' res: '90 00' -- req: 'E0 01 9F 36 02 00 37' +- req: '80 01 9F 36 02 00 37' res: '90 00' -- req: 'E0 01 9F 1A 02 02 46' +- req: '80 01 9F 1A 02 02 46' res: '90 00' -- req: 'E0 01 00 57 13 43 18 70 09 90 03 85 76 D1 70 32 01 10 14 62 19 00 15 0F' +- req: '80 01 00 57 13 43 18 70 09 90 03 85 76 D1 70 32 01 10 14 62 19 00 15 0F' res: '90 00' -#- req: 'E0 01 9F 27 01 80' -- req: 'E0 01 9F 27 01 40' +#- req: '80 01 9F 27 01 80' +- req: '80 01 9F 27 01 40' res: '90 00' -- req: 'E0 01 00 9A 03 20 08 04' +- req: '80 01 00 9A 03 20 08 04' res: '90 00' -- req: 'E0 01 9F 45 02 00 00' +- req: '80 01 9F 45 02 00 00' res: '90 00' -- req: 'E0 01 9F 46 B0 0A 5D A7 C7 22 2E 1F 7C C8 7D EE D6 05 4C D3 18 E4 2D B7 41 54 41 66 99 E5 A4 E4 42 5B 3B C2 FD 7E DB 6B 1A 28 35 55 13 E9 DE AE A5 FF 86 93 20 B1 20 41 B2 D4 44 56 0B DA 5B 7A 8E C0 72 8E B0 57 D7 EE 7D 37 2D 34 44 60 9F C4 3B B9 47 85 B1 50 9F CD FC BD 1D BA DD 26 77 6A B1 2A 4A CB 1A 4A B8 A6 DF 67 21 B6 61 D7 02 D8 E3 B5 9A 84 FF E0 4C 2C 73 32 69 5D F2 32 68 B8 4A 85 EF 63 D0 2B 62 51 9A 34 E9 A4 2F 0B 24 96 9C 14 19 85 AB 71 7F 51 96 B0 27 6A B6 B6 8A 5A 70 32 7D 6A 79 F3 C9 5A 22 33 A8 52 5C 81 86 62 B1 90 89 C3 CA' +- req: '80 01 9F 46 B0 0A 5D A7 C7 22 2E 1F 7C C8 7D EE D6 05 4C D3 18 E4 2D B7 41 54 41 66 99 E5 A4 E4 42 5B 3B C2 FD 7E DB 6B 1A 28 35 55 13 E9 DE AE A5 FF 86 93 20 B1 20 41 B2 D4 44 56 0B DA 5B 7A 8E C0 72 8E B0 57 D7 EE 7D 37 2D 34 44 60 9F C4 3B B9 47 85 B1 50 9F CD FC BD 1D BA DD 26 77 6A B1 2A 4A CB 1A 4A B8 A6 DF 67 21 B6 61 D7 02 D8 E3 B5 9A 84 FF E0 4C 2C 73 32 69 5D F2 32 68 B8 4A 85 EF 63 D0 2B 62 51 9A 34 E9 A4 2F 0B 24 96 9C 14 19 85 AB 71 7F 51 96 B0 27 6A B6 B6 8A 5A 70 32 7D 6A 79 F3 C9 5A 22 33 A8 52 5C 81 86 62 B1 90 89 C3 CA' res: '90 00' -- req: 'E0 01 9F 1F 18 31 30 31 34 36 30 30 30 30 30 31 30 30 30 30 32 31 39 30 30 30 30 30 30' +- req: '80 01 9F 1F 18 31 30 31 34 36 30 30 30 30 30 31 30 30 30 30 32 31 39 30 30 30 30 30 30' res: '90 00' -- req: 'E0 01 00 8D 17 8A 02 9F 02 06 9F 03 06 9F 1A 02 95 05 5F 2A 02 9A 03 9C 01 9F 37 04' +- req: '80 01 00 8D 17 8A 02 9F 02 06 9F 03 06 9F 1A 02 95 05 5F 2A 02 9A 03 9C 01 9F 37 04' res: '90 00' -#- req: 'E0 01 00 50 0B 56 49 53 41 20 43 52 45 44 49 54' -- req: 'E0 01 00 50 0A 56 49 53 41 20 44 45 42 49 54' +#- req: '80 01 00 50 0B 56 49 53 41 20 43 52 45 44 49 54' +- req: '80 01 00 50 0A 56 49 53 41 20 44 45 42 49 54' res: '90 00' -- req: 'E0 01 00 92 24 A6 2A 6D ED BB 33 99 F9 29 14 8D 48 88 AD E7 4A EB F8 00 94 DA D8 24 D1 48 05 B7 CB B3 FB DC 5B D3 58 B5 3B' +- req: '80 01 00 92 24 A6 2A 6D ED BB 33 99 F9 29 14 8D 48 88 AD E7 4A EB F8 00 94 DA D8 24 D1 48 05 B7 CB B3 FB DC 5B D3 58 B5 3B' res: '90 00' -- req: 'E0 01 9F 35 01 23' +- req: '80 01 9F 35 01 23' res: '90 00' -- req: 'E0 01 00 8E 14 00 00 00 00 00 00 00 00 42 01 44 03 41 03 1E 03 02 03 1F 03' +- req: '80 01 00 8E 14 00 00 00 00 00 00 00 00 42 01 44 03 41 03 1E 03 02 03 1F 03' res: '90 00' -- req: 'E0 01 9F 4A 01 82' +- req: '80 01 9F 4A 01 82' res: '90 00' -- req: 'E0 01 9F 49 03 9F 37 04' +- req: '80 01 9F 49 03 9F 37 04' res: '90 00' -- req: 'E0 01 9F 37 04 2F 19 34 47' +- req: '80 01 9F 37 04 2F 19 34 47' res: '90 00' -- req: 'E0 01 00 90 B0 29 50 6F 51 DB 60 43 44 73 4F E8 ED 16 EF 0A 21 D2 64 BC C9 22 16 AB 12 D4 DB F7 B4 5D 5C BA 4E 95 8A 71 F0 8B 78 8B DE 64 81 28 31 66 92 BE 7F 38 E4 06 84 02 EB 51 0E 19 06 86 84 56 66 51 17 BC BA C5 AB 97 67 D5 CE BB DE 65 9D 56 A2 CB CF 40 5D 04 72 D7 1A 2F 76 75 F0 B9 38 3C 83 EA 10 2B DA 6E BA 1F 19 98 F8 21 82 B3 E5 5D 18 EB F5 26 CE 01 57 DE 2F 16 F3 2C 3C F8 82 D7 01 3F B9 43 D7 C0 53 E0 0C 40 9D A9 B4 0D 8A 97 E1 8C AB A3 BE A2 A6 AA 7A 9C E2 F4 36 0E F6 74 A3 D8 B2 FE D8 D6 D7 35 71 C2 32 43 85 CA 61 37 95 26 0B' +- req: '80 01 00 90 B0 29 50 6F 51 DB 60 43 44 73 4F E8 ED 16 EF 0A 21 D2 64 BC C9 22 16 AB 12 D4 DB F7 B4 5D 5C BA 4E 95 8A 71 F0 8B 78 8B DE 64 81 28 31 66 92 BE 7F 38 E4 06 84 02 EB 51 0E 19 06 86 84 56 66 51 17 BC BA C5 AB 97 67 D5 CE BB DE 65 9D 56 A2 CB CF 40 5D 04 72 D7 1A 2F 76 75 F0 B9 38 3C 83 EA 10 2B DA 6E BA 1F 19 98 F8 21 82 B3 E5 5D 18 EB F5 26 CE 01 57 DE 2F 16 F3 2C 3C F8 82 D7 01 3F B9 43 D7 C0 53 E0 0C 40 9D A9 B4 0D 8A 97 E1 8C AB A3 BE A2 A6 AA 7A 9C E2 F4 36 0E F6 74 A3 D8 B2 FE D8 D6 D7 35 71 C2 32 43 85 CA 61 37 95 26 0B' res: '90 00' -- req: 'E0 01 9F 0E 05 00 10 00 00 00' +- req: '80 01 9F 0E 05 00 10 00 00 00' res: '90 00' -- req: 'E0 01 9F 0F 05 B8 68 BC 98 00' +- req: '80 01 9F 0F 05 B8 68 BC 98 00' res: '90 00' -- req: 'E0 01 00 94 0C 08 01 01 00 10 01 03 00 18 01 02 01' +- req: '80 01 00 94 0C 08 01 01 00 10 01 03 00 18 01 02 01' res: '90 00' -- req: 'E0 01 00 8F 01 92' +- req: '80 01 00 8F 01 92' res: '90 00' -- req: 'E0 01 00 5A 08 43 18 70 09 90 03 85 76' +- req: '80 01 00 5A 08 43 18 70 09 90 03 85 76' res: '90 00' -- req: 'E0 01 9F 42 02 09 78' +- req: '80 01 9F 42 02 09 78' res: '90 00' -- req: 'E0 01 5F 2D 04 66 69 65 6E' +- req: '80 01 5F 2D 04 66 69 65 6E' res: '90 00' -- req: 'E0 01 9F 34 03 44 03 02' +- req: '80 01 9F 34 03 44 03 02' res: '90 00' -- req: 'E0 01 9F 02 06 00 00 00 00 05 00' +- req: '80 01 9F 02 06 00 00 00 00 05 00' res: '90 00' -- req: 'E0 01 9F 47 01 03' +- req: '80 01 9F 47 01 03' res: '90 00' -- req: 'E0 01 9F 0D 05 B8 40 AC 88 00' +- req: '80 01 9F 0D 05 B8 40 AC 88 00' res: '90 00' -- req: 'E0 01 00 9C 01 21' +- req: '80 01 00 9C 01 21' res: '90 00' -- req: 'E0 01 5F 20 1A 54 45 53 54 49 20 53 2D 45 54 55 20 56 49 53 41 20 44 55 41 4C 50 41 4E 20 36' +- req: '80 01 5F 20 1A 54 45 53 54 49 20 53 2D 45 54 55 20 56 49 53 41 20 44 55 41 4C 50 41 4E 20 36' res: '90 00' -- req: 'E0 01 00 82 02 3C 00' +- req: '80 01 00 82 02 3C 00' res: '90 00' -- req: 'E0 01 00 87 01 01' +- req: '80 01 00 87 01 01' res: '90 00' \ No newline at end of file diff --git a/src/main/rust/config/card_setup_app_apdus.yaml b/src/main/rust/config/card_setup_app_apdus.yaml index d3fb65a..0e9ecc3 100644 --- a/src/main/rust/config/card_setup_app_apdus.yaml +++ b/src/main/rust/config/card_setup_app_apdus.yaml @@ -2,120 +2,120 @@ - req: '00 A4 04 00 07 AF FF FF FF FF 12 34' res: '90 00' # "Factory reset" -- req: 'E0 05 00 00 00' +- req: '80 05 00 00 00' res: '90 00' # Setup settings # ICC RSA Key = icc_1234560012345608_e_3_private_key.pem # ICC RSA Key modulus -- req: 'E0 00 00 04 80 C0 C3 22 9F B5 DA 18 D0 71 84 16 DD 70 C4 95 B1 49 5A 18 38 B7 A1 D6 AF F2 C0 78 AB F2 4D 30 73 C0 CB F1 F8 FB 7D 7C 4E EF 92 5E 00 C3 57 B0 9D D2 ED 29 6B 15 89 8C C0 2A 0A 68 BE AE B5 96 AE DF 7E 5D 7A F7 71 8F 48 E4 D4 B0 1B 53 FC 44 4E B5 81 2D 3E 3B C1 86 93 8D 71 1A 89 29 6D 80 AA 4E D3 49 B2 6A FD E3 C1 07 22 1B 98 E8 0B EB 60 4D 99 F0 98 5D 43 48 D4 A7 D9 1A DE A0 97 1B FD' +- req: '80 00 00 04 80 C0 C3 22 9F B5 DA 18 D0 71 84 16 DD 70 C4 95 B1 49 5A 18 38 B7 A1 D6 AF F2 C0 78 AB F2 4D 30 73 C0 CB F1 F8 FB 7D 7C 4E EF 92 5E 00 C3 57 B0 9D D2 ED 29 6B 15 89 8C C0 2A 0A 68 BE AE B5 96 AE DF 7E 5D 7A F7 71 8F 48 E4 D4 B0 1B 53 FC 44 4E B5 81 2D 3E 3B C1 86 93 8D 71 1A 89 29 6D 80 AA 4E D3 49 B2 6A FD E3 C1 07 22 1B 98 E8 0B EB 60 4D 99 F0 98 5D 43 48 D4 A7 D9 1A DE A0 97 1B FD' res: '90 00' # ICC RSA Key private exponent -- req: 'E0 00 00 05 80 80 82 17 15 23 E6 BB 35 A1 02 B9 E8 F5 D8 63 CB 86 3C 10 25 CF C1 39 CA A1 D5 A5 C7 F6 DE 20 4D 2B 32 A1 50 A7 A8 FD 89 F5 0C 3E AB 2C E5 20 69 37 48 C6 47 63 B1 08 80 1C 06 F0 7F 1F 23 B9 C8 C1 EB B7 49 BA 7C BC 99 C3 50 7F 7B 52 A8 49 B1 AA 10 1D 8B FE 2D 59 D2 84 08 F2 B6 56 27 5B B4 84 5B 09 91 43 34 5F 69 94 A5 ED 97 AB 7A FF 3A A3 B1 05 21 4A 9F 8F 8A 6C 01 B4 3F 6E 38 8D AB' +- req: '80 00 00 05 80 80 82 17 15 23 E6 BB 35 A1 02 B9 E8 F5 D8 63 CB 86 3C 10 25 CF C1 39 CA A1 D5 A5 C7 F6 DE 20 4D 2B 32 A1 50 A7 A8 FD 89 F5 0C 3E AB 2C E5 20 69 37 48 C6 47 63 B1 08 80 1C 06 F0 7F 1F 23 B9 C8 C1 EB B7 49 BA 7C BC 99 C3 50 7F 7B 52 A8 49 B1 AA 10 1D 8B FE 2D 59 D2 84 08 F2 B6 56 27 5B B4 84 5B 09 91 43 34 5F 69 94 A5 ED 97 AB 7A FF 3A A3 B1 05 21 4A 9F 8F 8A 6C 01 B4 3F 6E 38 8D AB' res: '90 00' # Pin code -- req: 'E0 00 00 01 02 12 34' +- req: '80 00 00 01 02 12 34' res: '90 00' # Use response template 2 (tag 77) -- req: 'E0 00 00 02 02 00 77' +- req: '80 00 00 02 02 00 77' res: '90 00' # Setup tag templates -- req: 'E0 02 00 01 04 00 82 00 94' +- req: '80 02 00 01 04 00 82 00 94' res: '90 00' -- req: 'E0 02 00 02 02 9F 4B' +- req: '80 02 00 02 02 9F 4B' res: '90 00' -- req: 'E0 02 00 03 08 9F 27 9F 36 9F 26 9F 10' +- req: '80 02 00 03 08 9F 27 9F 36 9F 26 9F 10' res: '90 00' -- req: 'E0 02 00 04 04 00 84 00 A5' +- req: '80 02 00 04 04 00 84 00 A5' res: '90 00' -- req: 'E0 02 00 05 0A 00 50 5F 2D 00 87 9F 12 9F 11' +- req: '80 02 00 05 0A 00 50 5F 2D 00 87 9F 12 9F 11' res: '90 00' # Setup READ RECORD tag templates -- req: 'E0 03 02 0C 06 00 57 5F 20 9F 1F' +- req: '80 03 02 0C 06 00 57 5F 20 9F 1F' res: '90 00' -- req: 'E0 03 01 14 06 9F 46 9F 47 9F 49' +- req: '80 03 01 14 06 9F 46 9F 47 9F 49' res: '90 00' -- req: 'E0 03 02 14 08 00 8F 9F 32 00 92 00 90' +- req: '80 03 02 14 08 00 8F 9F 32 00 92 00 90' res: '90 00' -- req: 'E0 03 01 1C 14 5F 24 00 5A 5F 34 9F 07 00 8E 9F 0D 9F 0E 9F 0F 5F 28 9F 4A' +- req: '80 03 01 1C 14 5F 24 00 5A 5F 34 9F 07 00 8E 9F 0D 9F 0E 9F 0F 5F 28 9F 4A' res: '90 00' -- req: 'E0 03 02 1C 0A 9F 42 9F 44 9F 08 00 8C 00 8D' +- req: '80 03 02 1C 0A 9F 42 9F 44 9F 08 00 8C 00 8D' res: '90 00' # Setup ICC EMV tags -- req: 'E0 01 9F 36 02 00 F0' +- req: '80 01 9F 36 02 00 F0' res: '90 00' -- req: 'E0 01 00 84 07 AF FF FF FF FF 12 34' +- req: '80 01 00 84 07 AF FF FF FF FF 12 34' res: '90 00' -- req: 'E0 01 00 50 0D 56 45 53 41 20 45 4C 45 43 54 52 4F 4E' +- req: '80 01 00 50 0D 56 45 53 41 20 45 4C 45 43 54 52 4F 4E' res: '90 00' -- req: 'E0 01 5F 2D 02 65 6E' +- req: '80 01 5F 2D 02 65 6E' res: '90 00' -- req: 'E0 01 00 87 01 01' +- req: '80 01 00 87 01 01' res: '90 00' -- req: 'E0 01 9F 12 10 56 45 53 41 20 20 20 20 20 20 20 20 20 20 20 20' +- req: '80 01 9F 12 10 56 45 53 41 20 20 20 20 20 20 20 20 20 20 20 20' res: '90 00' -- req: 'E0 01 9F 11 01 01' +- req: '80 01 9F 11 01 01' res: '90 00' -- req: 'E0 01 00 82 02 3C 00' +- req: '80 01 00 82 02 3C 00' res: '90 00' -- req: 'E0 01 00 94 0C 08 02 02 00 10 01 02 00 18 01 02 01' +- req: '80 01 00 94 0C 08 02 02 00 10 01 02 00 18 01 02 01' res: '90 00' -- req: 'E0 01 00 57 13 12 34 56 00 12 34 56 08 D1 81 12 21 12 29 42 49 00 20 0F' +- req: '80 01 00 57 13 12 34 56 00 12 34 56 08 D1 81 12 21 12 29 42 49 00 20 0F' res: '90 00' -- req: 'E0 01 5F 20 1A 34 35 33 37 46 49 2F 56 45 53 41 45 4C 45 43 54 52 4F 4E 45 4C 4F 4B 33 31 36' +- req: '80 01 5F 20 1A 34 35 33 37 46 49 2F 56 45 53 41 45 4C 45 43 54 52 4F 4E 45 4C 4F 4B 33 31 36' res: '90 00' -- req: 'E0 01 9F 1F 18 31 32 32 39 34 30 30 30 30 30 32 30 30 30 30 32 34 39 30 30 30 30 30 30' +- req: '80 01 9F 1F 18 31 32 32 39 34 30 30 30 30 30 32 30 30 30 30 32 34 39 30 30 30 30 30 30' res: '90 00' -- req: 'E0 01 9F 46 B0 91 C0 3D C4 32 72 45 67 48 61 B3 29 C2 F2 E0 DA 63 69 68 6E CB F8 6A 20 1D A1 47 C5 2F 38 96 C3 4A 91 B6 67 85 6A D1 69 9C 6F 41 D8 80 CF 62 1C C2 46 F3 7A A3 67 71 81 BF BE 9B 97 F8 BE 98 F7 6F 83 2D 3C 5B 4E 2F B6 AC C0 A0 CF 11 D1 E3 28 99 82 37 96 1E B2 4D 27 B8 1D C6 99 DE 83 59 B1 07 48 EF 82 80 8D BD 51 5A 17 09 29 7B 51 D9 F2 3B B6 DB B7 56 80 54 4E 6A 8E 18 BE EF 2D 68 FB B5 9C B8 4E 77 3A FA C2 61 3A D1 66 16 20 F3 9C 10 5D 8D 66 C0 D2 D5 26 09 63 12 2D 9A FA 2B 90 8F FC FB 79 6B 3A 12 D3 CB 9A 8D 0E 4A 43 24 71' +- req: '80 01 9F 46 B0 91 C0 3D C4 32 72 45 67 48 61 B3 29 C2 F2 E0 DA 63 69 68 6E CB F8 6A 20 1D A1 47 C5 2F 38 96 C3 4A 91 B6 67 85 6A D1 69 9C 6F 41 D8 80 CF 62 1C C2 46 F3 7A A3 67 71 81 BF BE 9B 97 F8 BE 98 F7 6F 83 2D 3C 5B 4E 2F B6 AC C0 A0 CF 11 D1 E3 28 99 82 37 96 1E B2 4D 27 B8 1D C6 99 DE 83 59 B1 07 48 EF 82 80 8D BD 51 5A 17 09 29 7B 51 D9 F2 3B B6 DB B7 56 80 54 4E 6A 8E 18 BE EF 2D 68 FB B5 9C B8 4E 77 3A FA C2 61 3A D1 66 16 20 F3 9C 10 5D 8D 66 C0 D2 D5 26 09 63 12 2D 9A FA 2B 90 8F FC FB 79 6B 3A 12 D3 CB 9A 8D 0E 4A 43 24 71' res: '90 00' -- req: 'E0 01 9F 47 01 03' +- req: '80 01 9F 47 01 03' res: '90 00' -- req: 'E0 01 9F 49 03 9F 37 04' +- req: '80 01 9F 49 03 9F 37 04' res: '90 00' -- req: 'E0 01 00 8F 01 92' +- req: '80 01 00 8F 01 92' res: '90 00' -- req: 'E0 01 9F 32 01 03' +- req: '80 01 9F 32 01 03' res: '90 00' -- req: 'E0 01 00 92 24 5F CE A1 52 B4 D9 EC 97 91 BF 30 96 72 FA 51 AF A9 56 2D 1C 0B 33 3E D6 1A 5A 20 00 40 C3 B5 0A 46 02 3B 89' +- req: '80 01 00 92 24 5F CE A1 52 B4 D9 EC 97 91 BF 30 96 72 FA 51 AF A9 56 2D 1C 0B 33 3E D6 1A 5A 20 00 40 C3 B5 0A 46 02 3B 89' res: '90 00' -- req: 'E0 01 00 90 B0 20 08 FB 40 DD A8 99 99 AF 87 3A 0D 9B AB 15 8D 5A CE 11 34 4F E3 8F 72 05 3C C5 EC CF E4 96 BB A5 8B 37 D6 69 BA B2 CE AF 93 7F 32 97 35 E0 27 41 E7 12 2C 83 2B E3 3C D1 AA 38 D2 7C DA CC ED 8B 02 F0 EA 23 1C 7C 6B CB F8 23 9E CF 2C 11 95 4B 40 7D 58 E9 A6 89 AB 22 DF C9 98 02 2A 17 9F AF C6 19 AB C5 AB 23 7C 68 41 02 39 12 93 95 57 5E 62 3F 4F 8B A8 38 0A 39 07 AC F4 20 09 B8 C3 D3 0F D1 0F BB 91 B1 3D C0 14 B6 19 BA 58 4C E0 B9 AC 6F B1 D3 A4 A7 45 03 F6 90 88 7F 11 13 13 D0 10 A3 A7 11 7E 8C 04 44 87 46 D3 AA F8 88 EA' +- req: '80 01 00 90 B0 20 08 FB 40 DD A8 99 99 AF 87 3A 0D 9B AB 15 8D 5A CE 11 34 4F E3 8F 72 05 3C C5 EC CF E4 96 BB A5 8B 37 D6 69 BA B2 CE AF 93 7F 32 97 35 E0 27 41 E7 12 2C 83 2B E3 3C D1 AA 38 D2 7C DA CC ED 8B 02 F0 EA 23 1C 7C 6B CB F8 23 9E CF 2C 11 95 4B 40 7D 58 E9 A6 89 AB 22 DF C9 98 02 2A 17 9F AF C6 19 AB C5 AB 23 7C 68 41 02 39 12 93 95 57 5E 62 3F 4F 8B A8 38 0A 39 07 AC F4 20 09 B8 C3 D3 0F D1 0F BB 91 B1 3D C0 14 B6 19 BA 58 4C E0 B9 AC 6F B1 D3 A4 A7 45 03 F6 90 88 7F 11 13 13 D0 10 A3 A7 11 7E 8C 04 44 87 46 D3 AA F8 88 EA' res: '90 00' -- req: 'E0 01 5F 24 03 18 11 30' +- req: '80 01 5F 24 03 18 11 30' res: '90 00' -- req: 'E0 01 00 5A 08 12 34 56 00 12 34 56 08' +- req: '80 01 00 5A 08 12 34 56 00 12 34 56 08' res: '90 00' -- req: 'E0 01 5F 34 01 01' +- req: '80 01 5F 34 01 01' res: '90 00' -- req: 'E0 01 9F 07 02 FF 80' +- req: '80 01 9F 07 02 FF 80' res: '90 00' -- req: 'E0 01 00 8E 14 00 00 00 00 00 00 00 00 02 01 44 03 41 03 1E 03 02 03 1F 00' +- req: '80 01 00 8E 14 00 00 00 00 00 00 00 00 02 01 44 03 41 03 1E 03 02 03 1F 00' res: '90 00' -- req: 'E0 01 9F 0D 05 B8 48 3C 98 00' +- req: '80 01 9F 0D 05 B8 48 3C 98 00' res: '90 00' -- req: 'E0 01 9F 0E 05 00 10 80 00 00' +- req: '80 01 9F 0E 05 00 10 80 00 00' res: '90 00' -- req: 'E0 01 9F 0F 05 B8 48 3C 98 00' +- req: '80 01 9F 0F 05 B8 48 3C 98 00' res: '90 00' -- req: 'E0 01 5F 28 02 02 46' +- req: '80 01 5F 28 02 02 46' res: '90 00' -- req: 'E0 01 9F 4A 01 82' +- req: '80 01 9F 4A 01 82' res: '90 00' -- req: 'E0 01 9F 42 02 09 78' +- req: '80 01 9F 42 02 09 78' res: '90 00' -- req: 'E0 01 9F 44 01 02' +- req: '80 01 9F 44 01 02' res: '90 00' -- req: 'E0 01 9F 08 02 00 96' +- req: '80 01 9F 08 02 00 96' res: '90 00' -- req: 'E0 01 00 8C 15 9F 02 06 9F 03 06 9F 1A 02 95 05 5F 2A 02 9A 03 9C 01 9F 37 04' +- req: '80 01 00 8C 15 9F 02 06 9F 03 06 9F 1A 02 95 05 5F 2A 02 9A 03 9C 01 9F 37 04' res: '90 00' -- req: 'E0 01 00 8D 17 8A 02 9F 02 06 9F 03 06 9F 1A 02 95 05 5F 2A 02 9A 03 9C 01 9F 37 04' +- req: '80 01 00 8D 17 8A 02 9F 02 06 9F 03 06 9F 1A 02 95 05 5F 2A 02 9A 03 9C 01 9F 37 04' res: '90 00' -- req: 'E0 01 00 A5 2E 50 0D 56 45 53 41 20 45 4C 45 43 54 52 4F 4E 5F 2D 02 65 6E 87 01 01 9F 12 10 56 45 53 41 20 20 20 20 20 20 20 20 20 20 20 20 9F 11 01 01' +- req: '80 01 00 A5 2E 50 0D 56 45 53 41 20 45 4C 45 43 54 52 4F 4E 5F 2D 02 65 6E 87 01 01 9F 12 10 56 45 53 41 20 20 20 20 20 20 20 20 20 20 20 20 9F 11 01 01' res: '90 00' -- req: 'E0 01 9F 4B 80 44 6A DC 3F 29 DB D7 AD AE D0 7C AD 17 C0 03 6D C8 8D BD FB 6A 42 B1 BB 33 E0 C0 62 69 99 77 7D 87 EE 4B 18 EA D6 E8 75 38 58 AB 2D 3F 0C 89 1F 93 8D 22 05 27 B1 BD CC 65 29 51 FD 45 1D 62 44 50 50 8D D0 36 BB DD FE AE DE 3A 1D 56 A8 CA AC C8 69 B8 4B 95 8C 71 CA C5 A9 04 57 86 01 5F D1 DC D7 85 1A 0B 83 8C 65 85 C4 ED 92 6B 00 0A 24 B1 A4 04 74 86 56 2E 99 1B E6 00 11 4F F0 86 FA' +- req: '80 01 9F 4B 80 44 6A DC 3F 29 DB D7 AD AE D0 7C AD 17 C0 03 6D C8 8D BD FB 6A 42 B1 BB 33 E0 C0 62 69 99 77 7D 87 EE 4B 18 EA D6 E8 75 38 58 AB 2D 3F 0C 89 1F 93 8D 22 05 27 B1 BD CC 65 29 51 FD 45 1D 62 44 50 50 8D D0 36 BB DD FE AE DE 3A 1D 56 A8 CA AC C8 69 B8 4B 95 8C 71 CA C5 A9 04 57 86 01 5F D1 DC D7 85 1A 0B 83 8C 65 85 C4 ED 92 6B 00 0A 24 B1 A4 04 74 86 56 2E 99 1B E6 00 11 4F F0 86 FA' res: '90 00' -- req: 'E0 01 9F 27 01 80' +- req: '80 01 9F 27 01 80' res: '90 00' -- req: 'E0 01 9F 26 08 B0 18 91 01 D1 14 16 C1' +- req: '80 01 9F 26 08 B0 18 91 01 D1 14 16 C1' res: '90 00' -- req: 'E0 01 9F 10 07 06 01 0A 03 A4 A0 02' +- req: '80 01 9F 10 07 06 01 0A 03 A4 A0 02' res: '90 00' \ No newline at end of file diff --git a/src/main/rust/config/card_setup_pse_apdus.yaml b/src/main/rust/config/card_setup_pse_apdus.yaml index c6b5e56..ed63c5d 100644 --- a/src/main/rust/config/card_setup_pse_apdus.yaml +++ b/src/main/rust/config/card_setup_pse_apdus.yaml @@ -2,28 +2,28 @@ - req: '00 A4 04 00 0E 31 50 41 59 2E 53 59 53 2E 44 44 46 30 31' res: '90 00' # "Factory reset" -- req: 'E0 05 00 00 00' +- req: '80 05 00 00 00' res: '90 00' # Setup tag templates -- req: 'E0 02 00 06 04 DF 02 DF 47' +- req: '80 02 00 06 04 DF 02 DF 47' res: '90 00' -- req: 'E0 02 00 05 08 00 88 5F 2D 9F 11 BF 0C' +- req: '80 02 00 05 08 00 88 5F 2D 9F 11 BF 0C' res: '90 00' -- req: 'E0 02 00 04 04 00 84 00 A5' +- req: '80 02 00 04 04 00 84 00 A5' res: '90 00' # Setup READ RECORD tag templates -- req: 'E0 03 01 0C 30 61 2E 4F 07 AF FF FF FF FF 12 34 50 0D 56 45 53 41 20 45 4C 45 43 54 52 4F 4E 9F 12 10 56 45 53 41 20 20 20 20 20 20 20 20 20 20 20 20 87 01 01' +- req: '80 03 01 0C 30 61 2E 4F 07 AF FF FF FF FF 12 34 50 0D 56 45 53 41 20 45 4C 45 43 54 52 4F 4E 9F 12 10 56 45 53 41 20 20 20 20 20 20 20 20 20 20 20 20 87 01 01' res: '90 00' # Setup ICC EMV tags -- req: 'E0 01 DF 02 02 02 46' +- req: '80 01 DF 02 02 02 46' res: '90 00' -- req: 'E0 01 DF 47 03 80 01 01' +- req: '80 01 DF 47 03 80 01 01' res: '90 00' -- req: 'E0 01 9F 11 01 01' +- req: '80 01 9F 11 01 01' res: '90 00' -- req: 'E0 01 5F 2D 02 65 6E' +- req: '80 01 5F 2D 02 65 6E' res: '90 00' -- req: 'E0 01 00 88 01 01' +- req: '80 01 00 88 01 01' res: '90 00' -- req: 'E0 01 00 84 0E 31 50 41 59 2E 53 59 53 2E 44 44 46 30 31' +- req: '80 01 00 84 0E 31 50 41 59 2E 53 59 53 2E 44 44 46 30 31' res: '90 00' \ No newline at end of file diff --git a/src/main/rust/config/download_log_pse_apdus.yaml b/src/main/rust/config/download_log_pse_apdus.yaml index 0e4d020..98fc4e0 100644 --- a/src/main/rust/config/download_log_pse_apdus.yaml +++ b/src/main/rust/config/download_log_pse_apdus.yaml @@ -2,88 +2,88 @@ - req: '00 A4 04 00 0E 31 50 41 59 2E 53 59 53 2E 44 44 46 30 31' res: '90 00' # "Unload messages" -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' # Select paymentapp AID - req: '00 A4 04 00 08 A0 00 00 00 03 10 10 01' #- req: '00 A4 04 00 07 AF FF FF FF FF 12 34' res: '90 00' # "Unload messages" -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' diff --git a/src/main/rust/config/setup_fuzzing_apdus.yaml b/src/main/rust/config/setup_fuzzing_apdus.yaml index 7fc8447..a5d0a2f 100644 --- a/src/main/rust/config/setup_fuzzing_apdus.yaml +++ b/src/main/rust/config/setup_fuzzing_apdus.yaml @@ -3,14 +3,14 @@ res: '90 00' # clear fuzzing -- req: 'E0 07 00 00 00' +- req: '80 07 00 00 00' res: '90 00' -- req: 'E0 03 01 0C 30 61 2F 4F 08 AF FF 00 00 03 10 10 01 50 0D 56 41 53 41 20 45 4C 45 43 54 52 41 4E 9F 12 10 56 41 53 41 20 20 20 20 20 20 20 20 20 20 20 20 87 01 FF' +- req: '80 03 01 0C 30 61 2F 4F 08 AF FF 00 00 03 10 10 01 50 0D 56 41 53 41 20 45 4C 45 43 54 52 41 4E 9F 12 10 56 41 53 41 20 20 20 20 20 20 20 20 20 20 20 20 87 01 FF' res: '90 00' # READ RECORD FALLBACK -- req: 'E0 00 00 06 02 01 0C' +- req: '80 00 00 06 02 01 0C' res: '90 00' # Select paymentapp AID @@ -19,66 +19,66 @@ res: '90 00' # clear fuzzing -- req: 'E0 07 00 00 00' +- req: '80 07 00 00 00' res: '90 00' # READ RECORD FALLBACK -- req: 'E0 00 00 06 02 01 0C' +- req: '80 00 00 06 02 01 0C' res: '90 00' -- req: 'E0 11 9F 10 04 00 40 00 00' +- req: '80 11 9F 10 04 00 40 00 00' res: '90 00' -- req: 'E0 11 9F 36 04 00 40 00 00' +- req: '80 11 9F 36 04 00 40 00 00' res: '90 00' -- req: 'E0 01 00 80 01 00' +- req: '80 01 00 80 01 00' res: '90 00' -- req: 'E0 11 00 80 04 00 40 00 00' +- req: '80 11 00 80 04 00 40 00 00' res: '90 00' -- req: 'E0 01 00 77 01 00' +- req: '80 01 00 77 01 00' res: '90 00' -- req: 'E0 11 00 77 04 00 40 00 00' +- req: '80 11 00 77 04 00 40 00 00' res: '90 00' ## Fuzz random data to tag 6F -#- req: 'E0 01 00 6F 01 00' +#- req: '80 01 00 6F 01 00' # res: '90 00' -#- req: 'E0 11 00 6F 04 00 40 00 00' +#- req: '80 11 00 6F 04 00 40 00 00' # res: '90 00' # Fuzz random data to tag 77 -##- req: 'E0 01 00 80 01 00' +##- req: '80 01 00 80 01 00' ## res: '90 00' -##- req: 'E0 11 00 80 04 00 20 00 00' +##- req: '80 11 00 80 04 00 20 00 00' ## res: '90 00' -##- req: 'E0 11 00 5A 04 00 40 00 00' +##- req: '80 11 00 5A 04 00 40 00 00' ## res: '90 00' -##- req: 'E0 11 00 8C 04 00 15 00 00' +##- req: '80 11 00 8C 04 00 15 00 00' ## res: '90 00' -##- req: 'E0 11 00 8D 04 00 15 00 00' +##- req: '80 11 00 8D 04 00 15 00 00' ## res: '90 00' ## Fuzz random data to tag 84 -#- req: 'E0 11 00 84 04 00 20 00 00' +#- req: '80 11 00 84 04 00 20 00 00' # res: '90 00' ## Fuzz random data to tag 50 -#- req: 'E0 11 00 50 04 00 20 00 00' +#- req: '80 11 00 50 04 00 20 00 00' # res: '90 00' # disable fuzzing -#- req: 'E0 11 00 8C 04 00 00 00 00' +#- req: '80 11 00 8C 04 00 00 00 00' # res: '90 00' -#- req: 'E0 11 00 8D 04 00 00 00 00' +#- req: '80 11 00 8D 04 00 00 00 00' # res: '90 00' -#- req: 'E0 11 00 80 04 00 00 00 00' +#- req: '80 11 00 80 04 00 00 00 00' # res: '90 00' -#- req: 'E0 11 00 5A 04 00 00 00 00' +#- req: '80 11 00 5A 04 00 00 00 00' # res: '90 00' -#- req: 'E0 11 00 50 04 00 00 00 00' +#- req: '80 11 00 50 04 00 00 00 00' # res: '90 00' -#- req: 'E0 11 00 84 04 00 00 00 00' +#- req: '80 11 00 84 04 00 00 00 00' # res: '90 00' -#- req: 'E0 11 00 77 04 00 00 00 00' +#- req: '80 11 00 77 04 00 00 00 00' # res: '90 00' -#- req: 'E0 11 00 6F 04 00 00 00 00' +#- req: '80 11 00 6F 04 00 00 00 00' # res: '90 00' diff --git a/src/test/java/config/card_log_consume_apdus.yaml b/src/test/java/config/card_log_consume_apdus.yaml index fa19281..0529f8b 100644 --- a/src/test/java/config/card_log_consume_apdus.yaml +++ b/src/test/java/config/card_log_consume_apdus.yaml @@ -2,21 +2,21 @@ - req: '00 A4 04 00 07 AF FF FF FF FF 12 34' res: '90 00' # Consume logs -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '90 00' -- req: 'E0 06 00 00 00' +- req: '80 06 00 00 00' res: '6A 83' diff --git a/src/test/java/config/card_setup_app_apdus.yaml b/src/test/java/config/card_setup_app_apdus.yaml index bf81175..eddd706 100644 --- a/src/test/java/config/card_setup_app_apdus.yaml +++ b/src/test/java/config/card_setup_app_apdus.yaml @@ -2,126 +2,126 @@ - req: '00 A4 04 00 07 AF FF FF FF FF 12 34' res: '90 00' # "Factory reset" -- req: 'E0 05 00 00 00' +- req: '80 05 00 00 00' res: '90 00' # Setup settings # Pin code -- req: 'E0 00 00 01 02 12 34' +- req: '80 00 00 01 02 12 34' res: '90 00' # Use response template 2 (tag 77) -- req: 'E0 00 00 02 02 00 77' +- req: '80 00 00 02 02 00 77' res: '90 00' # ICC RSA Key = icc_1234560012345608_e_3_private_key.pem # ICC RSA Key modulus -- req: 'E0 00 00 04 80 C0 C3 22 9F B5 DA 18 D0 71 84 16 DD 70 C4 95 B1 49 5A 18 38 B7 A1 D6 AF F2 C0 78 AB F2 4D 30 73 C0 CB F1 F8 FB 7D 7C 4E EF 92 5E 00 C3 57 B0 9D D2 ED 29 6B 15 89 8C C0 2A 0A 68 BE AE B5 96 AE DF 7E 5D 7A F7 71 8F 48 E4 D4 B0 1B 53 FC 44 4E B5 81 2D 3E 3B C1 86 93 8D 71 1A 89 29 6D 80 AA 4E D3 49 B2 6A FD E3 C1 07 22 1B 98 E8 0B EB 60 4D 99 F0 98 5D 43 48 D4 A7 D9 1A DE A0 97 1B FD' +- req: '80 00 00 04 80 C0 C3 22 9F B5 DA 18 D0 71 84 16 DD 70 C4 95 B1 49 5A 18 38 B7 A1 D6 AF F2 C0 78 AB F2 4D 30 73 C0 CB F1 F8 FB 7D 7C 4E EF 92 5E 00 C3 57 B0 9D D2 ED 29 6B 15 89 8C C0 2A 0A 68 BE AE B5 96 AE DF 7E 5D 7A F7 71 8F 48 E4 D4 B0 1B 53 FC 44 4E B5 81 2D 3E 3B C1 86 93 8D 71 1A 89 29 6D 80 AA 4E D3 49 B2 6A FD E3 C1 07 22 1B 98 E8 0B EB 60 4D 99 F0 98 5D 43 48 D4 A7 D9 1A DE A0 97 1B FD' res: '90 00' # ICC RSA Key private exponent -- req: 'E0 00 00 05 80 80 82 17 15 23 E6 BB 35 A1 02 B9 E8 F5 D8 63 CB 86 3C 10 25 CF C1 39 CA A1 D5 A5 C7 F6 DE 20 4D 2B 32 A1 50 A7 A8 FD 89 F5 0C 3E AB 2C E5 20 69 37 48 C6 47 63 B1 08 80 1C 06 F0 7F 1F 23 B9 C8 C1 EB B7 49 BA 7C BC 99 C3 50 7F 7B 52 A8 49 B1 AA 10 1D 8B FE 2D 59 D2 84 08 F2 B6 56 27 5B B4 84 5B 09 91 43 34 5F 69 94 A5 ED 97 AB 7A FF 3A A3 B1 05 21 4A 9F 8F 8A 6C 01 B4 3F 6E 38 8D AB' +- req: '80 00 00 05 80 80 82 17 15 23 E6 BB 35 A1 02 B9 E8 F5 D8 63 CB 86 3C 10 25 CF C1 39 CA A1 D5 A5 C7 F6 DE 20 4D 2B 32 A1 50 A7 A8 FD 89 F5 0C 3E AB 2C E5 20 69 37 48 C6 47 63 B1 08 80 1C 06 F0 7F 1F 23 B9 C8 C1 EB B7 49 BA 7C BC 99 C3 50 7F 7B 52 A8 49 B1 AA 10 1D 8B FE 2D 59 D2 84 08 F2 B6 56 27 5B B4 84 5B 09 91 43 34 5F 69 94 A5 ED 97 AB 7A FF 3A A3 B1 05 21 4A 9F 8F 8A 6C 01 B4 3F 6E 38 8D AB' res: '90 00' # Setup tag templates -- req: 'E0 02 00 01 04 00 82 00 94' +- req: '80 02 00 01 04 00 82 00 94' res: '90 00' -- req: 'E0 02 00 02 02 9F 4B' +- req: '80 02 00 02 02 9F 4B' res: '90 00' -- req: 'E0 02 00 03 08 9F 27 9F 36 9F 26 9F 10' +- req: '80 02 00 03 08 9F 27 9F 36 9F 26 9F 10' res: '90 00' -- req: 'E0 02 00 04 04 00 84 00 A5' +- req: '80 02 00 04 04 00 84 00 A5' res: '90 00' -- req: 'E0 02 00 05 0A 00 50 5F 2D 00 87 9F 12 9F 11' +- req: '80 02 00 05 0A 00 50 5F 2D 00 87 9F 12 9F 11' res: '90 00' # Setup READ RECORD tag templates -- req: 'E0 03 02 0C 06 00 57 5F 20 9F 1F' +- req: '80 03 02 0C 06 00 57 5F 20 9F 1F' res: '90 00' -- req: 'E0 03 01 14 06 9F 46 9F 47 9F 49' +- req: '80 03 01 14 06 9F 46 9F 47 9F 49' res: '90 00' -- req: 'E0 03 02 14 08 00 8F 9F 32 00 92 00 90' +- req: '80 03 02 14 08 00 8F 9F 32 00 92 00 90' res: '90 00' -- req: 'E0 03 01 1C 14 5F 24 00 5A 5F 34 9F 07 00 8E 9F 0D 9F 0E 9F 0F 5F 28 9F 4A' +- req: '80 03 01 1C 14 5F 24 00 5A 5F 34 9F 07 00 8E 9F 0D 9F 0E 9F 0F 5F 28 9F 4A' res: '90 00' -- req: 'E0 03 02 1C 0A 9F 42 9F 44 9F 08 00 8C 00 8D' +- req: '80 03 02 1C 0A 9F 42 9F 44 9F 08 00 8C 00 8D' res: '90 00' # Setup ICC EMV tags # Fuzz random data to tag 77 -#- req: 'E0 01 00 77 01 00' +#- req: '80 01 00 77 01 00' # res: '90 00' -#- req: 'E0 11 00 77 04 00 20 00 00' +#- req: '80 11 00 77 04 00 20 00 00' # res: '90 00' -- req: 'E0 01 9F 36 02 00 F0' +- req: '80 01 9F 36 02 00 F0' res: '90 00' -- req: 'E0 01 00 84 07 AF FF FF FF FF 12 34' +- req: '80 01 00 84 07 AF FF FF FF FF 12 34' res: '90 00' -- req: 'E0 01 00 50 0D 56 45 53 41 20 45 4C 45 43 54 52 4F 4E' +- req: '80 01 00 50 0D 56 45 53 41 20 45 4C 45 43 54 52 4F 4E' res: '90 00' -- req: 'E0 01 5F 2D 02 65 6E' +- req: '80 01 5F 2D 02 65 6E' res: '90 00' -- req: 'E0 01 00 87 01 01' +- req: '80 01 00 87 01 01' res: '90 00' -- req: 'E0 01 9F 12 10 56 45 53 41 20 20 20 20 20 20 20 20 20 20 20 20' +- req: '80 01 9F 12 10 56 45 53 41 20 20 20 20 20 20 20 20 20 20 20 20' res: '90 00' -- req: 'E0 01 9F 11 01 01' +- req: '80 01 9F 11 01 01' res: '90 00' -- req: 'E0 01 00 82 02 3C 00' +- req: '80 01 00 82 02 3C 00' res: '90 00' -- req: 'E0 01 00 94 0C 08 02 02 00 10 01 02 00 18 01 02 01' +- req: '80 01 00 94 0C 08 02 02 00 10 01 02 00 18 01 02 01' res: '90 00' # Track2 -- req: 'E0 01 00 57 0F 12 34 56 00 12 34 56 00 D1 81 12 20 09 99 9F' +- req: '80 01 00 57 0F 12 34 56 00 12 34 56 00 D1 81 12 20 09 99 9F' res: '90 00' -- req: 'E0 01 5F 20 1A 34 35 33 37 46 49 2F 56 45 53 41 45 4C 45 43 54 52 4F 4E 45 4C 4F 4B 33 31 36' +- req: '80 01 5F 20 1A 34 35 33 37 46 49 2F 56 45 53 41 45 4C 45 43 54 52 4F 4E 45 4C 4F 4B 33 31 36' res: '90 00' -- req: 'E0 01 9F 1F 18 31 32 32 39 34 30 30 30 30 30 32 30 30 30 30 32 34 39 30 30 30 30 30 30' +- req: '80 01 9F 1F 18 31 32 32 39 34 30 30 30 30 30 32 30 30 30 30 32 34 39 30 30 30 30 30 30' res: '90 00' -- req: 'E0 01 9F 46 B0 91 C0 3D C4 32 72 45 67 48 61 B3 29 C2 F2 E0 DA 63 69 68 6E CB F8 6A 20 1D A1 47 C5 2F 38 96 C3 4A 91 B6 67 85 6A D1 69 9C 6F 41 D8 80 CF 62 1C C2 46 F3 7A A3 67 71 81 BF BE 9B 97 F8 BE 98 F7 6F 83 2D 3C 5B 4E 2F B6 AC C0 A0 CF 11 D1 E3 28 99 82 37 96 1E B2 4D 27 B8 1D C6 99 DE 83 59 B1 07 48 EF 82 80 8D BD 51 5A 17 09 29 7B 51 D9 F2 3B B6 DB B7 56 80 54 4E 6A 8E 18 BE EF 2D 68 FB B5 9C B8 4E 77 3A FA C2 61 3A D1 66 16 20 F3 9C 10 5D 8D 66 C0 D2 D5 26 09 63 12 2D 9A FA 2B 90 8F FC FB 79 6B 3A 12 D3 CB 9A 8D 0E 4A 43 24 71' +- req: '80 01 9F 46 B0 91 C0 3D C4 32 72 45 67 48 61 B3 29 C2 F2 E0 DA 63 69 68 6E CB F8 6A 20 1D A1 47 C5 2F 38 96 C3 4A 91 B6 67 85 6A D1 69 9C 6F 41 D8 80 CF 62 1C C2 46 F3 7A A3 67 71 81 BF BE 9B 97 F8 BE 98 F7 6F 83 2D 3C 5B 4E 2F B6 AC C0 A0 CF 11 D1 E3 28 99 82 37 96 1E B2 4D 27 B8 1D C6 99 DE 83 59 B1 07 48 EF 82 80 8D BD 51 5A 17 09 29 7B 51 D9 F2 3B B6 DB B7 56 80 54 4E 6A 8E 18 BE EF 2D 68 FB B5 9C B8 4E 77 3A FA C2 61 3A D1 66 16 20 F3 9C 10 5D 8D 66 C0 D2 D5 26 09 63 12 2D 9A FA 2B 90 8F FC FB 79 6B 3A 12 D3 CB 9A 8D 0E 4A 43 24 71' res: '90 00' -- req: 'E0 01 9F 47 01 03' +- req: '80 01 9F 47 01 03' res: '90 00' -- req: 'E0 01 9F 49 03 9F 37 04' +- req: '80 01 9F 49 03 9F 37 04' res: '90 00' -- req: 'E0 01 00 8F 01 92' +- req: '80 01 00 8F 01 92' res: '90 00' -- req: 'E0 01 9F 32 01 03' +- req: '80 01 9F 32 01 03' res: '90 00' -- req: 'E0 01 00 92 24 5F CE A1 52 B4 D9 EC 97 91 BF 30 96 72 FA 51 AF A9 56 2D 1C 0B 33 3E D6 1A 5A 20 00 40 C3 B5 0A 46 02 3B 89' +- req: '80 01 00 92 24 5F CE A1 52 B4 D9 EC 97 91 BF 30 96 72 FA 51 AF A9 56 2D 1C 0B 33 3E D6 1A 5A 20 00 40 C3 B5 0A 46 02 3B 89' res: '90 00' -- req: 'E0 01 00 90 B0 20 08 FB 40 DD A8 99 99 AF 87 3A 0D 9B AB 15 8D 5A CE 11 34 4F E3 8F 72 05 3C C5 EC CF E4 96 BB A5 8B 37 D6 69 BA B2 CE AF 93 7F 32 97 35 E0 27 41 E7 12 2C 83 2B E3 3C D1 AA 38 D2 7C DA CC ED 8B 02 F0 EA 23 1C 7C 6B CB F8 23 9E CF 2C 11 95 4B 40 7D 58 E9 A6 89 AB 22 DF C9 98 02 2A 17 9F AF C6 19 AB C5 AB 23 7C 68 41 02 39 12 93 95 57 5E 62 3F 4F 8B A8 38 0A 39 07 AC F4 20 09 B8 C3 D3 0F D1 0F BB 91 B1 3D C0 14 B6 19 BA 58 4C E0 B9 AC 6F B1 D3 A4 A7 45 03 F6 90 88 7F 11 13 13 D0 10 A3 A7 11 7E 8C 04 44 87 46 D3 AA F8 88 EA' +- req: '80 01 00 90 B0 20 08 FB 40 DD A8 99 99 AF 87 3A 0D 9B AB 15 8D 5A CE 11 34 4F E3 8F 72 05 3C C5 EC CF E4 96 BB A5 8B 37 D6 69 BA B2 CE AF 93 7F 32 97 35 E0 27 41 E7 12 2C 83 2B E3 3C D1 AA 38 D2 7C DA CC ED 8B 02 F0 EA 23 1C 7C 6B CB F8 23 9E CF 2C 11 95 4B 40 7D 58 E9 A6 89 AB 22 DF C9 98 02 2A 17 9F AF C6 19 AB C5 AB 23 7C 68 41 02 39 12 93 95 57 5E 62 3F 4F 8B A8 38 0A 39 07 AC F4 20 09 B8 C3 D3 0F D1 0F BB 91 B1 3D C0 14 B6 19 BA 58 4C E0 B9 AC 6F B1 D3 A4 A7 45 03 F6 90 88 7F 11 13 13 D0 10 A3 A7 11 7E 8C 04 44 87 46 D3 AA F8 88 EA' res: '90 00' -- req: 'E0 01 5F 24 03 18 11 30' +- req: '80 01 5F 24 03 18 11 30' res: '90 00' -- req: 'E0 01 00 5A 08 12 34 56 00 12 34 56 08' +- req: '80 01 00 5A 08 12 34 56 00 12 34 56 08' res: '90 00' -- req: 'E0 01 5F 34 01 01' +- req: '80 01 5F 34 01 01' res: '90 00' -- req: 'E0 01 9F 07 02 FF 80' +- req: '80 01 9F 07 02 FF 80' res: '90 00' -- req: 'E0 01 00 8E 14 00 00 00 00 00 00 00 00 02 01 44 03 41 03 1E 03 02 03 1F 00' +- req: '80 01 00 8E 14 00 00 00 00 00 00 00 00 02 01 44 03 41 03 1E 03 02 03 1F 00' res: '90 00' -- req: 'E0 01 9F 0D 05 B8 48 3C 98 00' +- req: '80 01 9F 0D 05 B8 48 3C 98 00' res: '90 00' -- req: 'E0 01 9F 0E 05 00 10 80 00 00' +- req: '80 01 9F 0E 05 00 10 80 00 00' res: '90 00' -- req: 'E0 01 9F 0F 05 B8 48 3C 98 00' +- req: '80 01 9F 0F 05 B8 48 3C 98 00' res: '90 00' -- req: 'E0 01 5F 28 02 02 46' +- req: '80 01 5F 28 02 02 46' res: '90 00' -- req: 'E0 01 9F 4A 01 82' +- req: '80 01 9F 4A 01 82' res: '90 00' -- req: 'E0 01 9F 42 02 09 78' +- req: '80 01 9F 42 02 09 78' res: '90 00' -- req: 'E0 01 9F 44 01 02' +- req: '80 01 9F 44 01 02' res: '90 00' -- req: 'E0 01 9F 08 02 00 96' +- req: '80 01 9F 08 02 00 96' res: '90 00' -- req: 'E0 01 00 8C 15 9F 02 06 9F 03 06 9F 1A 02 95 05 5F 2A 02 9A 03 9C 01 9F 37 04' +- req: '80 01 00 8C 15 9F 02 06 9F 03 06 9F 1A 02 95 05 5F 2A 02 9A 03 9C 01 9F 37 04' res: '90 00' -- req: 'E0 01 00 8D 17 8A 02 9F 02 06 9F 03 06 9F 1A 02 95 05 5F 2A 02 9A 03 9C 01 9F 37 04' +- req: '80 01 00 8D 17 8A 02 9F 02 06 9F 03 06 9F 1A 02 95 05 5F 2A 02 9A 03 9C 01 9F 37 04' res: '90 00' -- req: 'E0 01 00 A5 2E 50 0D 56 45 53 41 20 45 4C 45 43 54 52 4F 4E 5F 2D 02 65 6E 87 01 01 9F 12 10 56 45 53 41 20 20 20 20 20 20 20 20 20 20 20 20 9F 11 01 01' +- req: '80 01 00 A5 2E 50 0D 56 45 53 41 20 45 4C 45 43 54 52 4F 4E 5F 2D 02 65 6E 87 01 01 9F 12 10 56 45 53 41 20 20 20 20 20 20 20 20 20 20 20 20 9F 11 01 01' res: '90 00' -- req: 'E0 01 9F 4B 80 44 6A DC 3F 29 DB D7 AD AE D0 7C AD 17 C0 03 6D C8 8D BD FB 6A 42 B1 BB 33 E0 C0 62 69 99 77 7D 87 EE 4B 18 EA D6 E8 75 38 58 AB 2D 3F 0C 89 1F 93 8D 22 05 27 B1 BD CC 65 29 51 FD 45 1D 62 44 50 50 8D D0 36 BB DD FE AE DE 3A 1D 56 A8 CA AC C8 69 B8 4B 95 8C 71 CA C5 A9 04 57 86 01 5F D1 DC D7 85 1A 0B 83 8C 65 85 C4 ED 92 6B 00 0A 24 B1 A4 04 74 86 56 2E 99 1B E6 00 11 4F F0 86 FA' +- req: '80 01 9F 4B 80 44 6A DC 3F 29 DB D7 AD AE D0 7C AD 17 C0 03 6D C8 8D BD FB 6A 42 B1 BB 33 E0 C0 62 69 99 77 7D 87 EE 4B 18 EA D6 E8 75 38 58 AB 2D 3F 0C 89 1F 93 8D 22 05 27 B1 BD CC 65 29 51 FD 45 1D 62 44 50 50 8D D0 36 BB DD FE AE DE 3A 1D 56 A8 CA AC C8 69 B8 4B 95 8C 71 CA C5 A9 04 57 86 01 5F D1 DC D7 85 1A 0B 83 8C 65 85 C4 ED 92 6B 00 0A 24 B1 A4 04 74 86 56 2E 99 1B E6 00 11 4F F0 86 FA' res: '90 00' -- req: 'E0 01 9F 27 01 80' +- req: '80 01 9F 27 01 80' res: '90 00' -- req: 'E0 01 9F 26 08 B0 18 91 01 D1 14 16 C1' +- req: '80 01 9F 26 08 B0 18 91 01 D1 14 16 C1' res: '90 00' -- req: 'E0 01 9F 10 07 06 01 0A 03 A4 A0 02' +- req: '80 01 9F 10 07 06 01 0A 03 A4 A0 02' res: '90 00' \ No newline at end of file diff --git a/src/test/java/config/card_setup_pse_apdus.yaml b/src/test/java/config/card_setup_pse_apdus.yaml index c6b5e56..ed63c5d 100644 --- a/src/test/java/config/card_setup_pse_apdus.yaml +++ b/src/test/java/config/card_setup_pse_apdus.yaml @@ -2,28 +2,28 @@ - req: '00 A4 04 00 0E 31 50 41 59 2E 53 59 53 2E 44 44 46 30 31' res: '90 00' # "Factory reset" -- req: 'E0 05 00 00 00' +- req: '80 05 00 00 00' res: '90 00' # Setup tag templates -- req: 'E0 02 00 06 04 DF 02 DF 47' +- req: '80 02 00 06 04 DF 02 DF 47' res: '90 00' -- req: 'E0 02 00 05 08 00 88 5F 2D 9F 11 BF 0C' +- req: '80 02 00 05 08 00 88 5F 2D 9F 11 BF 0C' res: '90 00' -- req: 'E0 02 00 04 04 00 84 00 A5' +- req: '80 02 00 04 04 00 84 00 A5' res: '90 00' # Setup READ RECORD tag templates -- req: 'E0 03 01 0C 30 61 2E 4F 07 AF FF FF FF FF 12 34 50 0D 56 45 53 41 20 45 4C 45 43 54 52 4F 4E 9F 12 10 56 45 53 41 20 20 20 20 20 20 20 20 20 20 20 20 87 01 01' +- req: '80 03 01 0C 30 61 2E 4F 07 AF FF FF FF FF 12 34 50 0D 56 45 53 41 20 45 4C 45 43 54 52 4F 4E 9F 12 10 56 45 53 41 20 20 20 20 20 20 20 20 20 20 20 20 87 01 01' res: '90 00' # Setup ICC EMV tags -- req: 'E0 01 DF 02 02 02 46' +- req: '80 01 DF 02 02 02 46' res: '90 00' -- req: 'E0 01 DF 47 03 80 01 01' +- req: '80 01 DF 47 03 80 01 01' res: '90 00' -- req: 'E0 01 9F 11 01 01' +- req: '80 01 9F 11 01 01' res: '90 00' -- req: 'E0 01 5F 2D 02 65 6E' +- req: '80 01 5F 2D 02 65 6E' res: '90 00' -- req: 'E0 01 00 88 01 01' +- req: '80 01 00 88 01 01' res: '90 00' -- req: 'E0 01 00 84 0E 31 50 41 59 2E 53 59 53 2E 44 44 46 30 31' +- req: '80 01 00 84 0E 31 50 41 59 2E 53 59 53 2E 44 44 46 30 31' res: '90 00' \ No newline at end of file diff --git a/src/test/java/emvcardsimulator/PaymentApplicationTest.java b/src/test/java/emvcardsimulator/PaymentApplicationTest.java index fc55e42..fb42a77 100644 --- a/src/test/java/emvcardsimulator/PaymentApplicationTest.java +++ b/src/test/java/emvcardsimulator/PaymentApplicationTest.java @@ -37,7 +37,7 @@ public void selectTest() throws CardException { assertEquals(ISO7816.SW_NO_ERROR, (short) response.getSW()); // Reset card setup - response = SmartCard.transmitCommand(new byte[] {(byte) 0xE0, (byte) 0x05, (byte) 0x00, (byte) 0x00, (byte) 0x00}); + response = SmartCard.transmitCommand(new byte[] {(byte) 0x80, (byte) 0x05, (byte) 0x00, (byte) 0x00, (byte) 0x00}); assertEquals(ISO7816.SW_NO_ERROR, (short) response.getSW()); } } diff --git a/src/test/java/emvcardsimulator/PaymentSystemEnvironmentTest.java b/src/test/java/emvcardsimulator/PaymentSystemEnvironmentTest.java index 945d491..5a85a91 100644 --- a/src/test/java/emvcardsimulator/PaymentSystemEnvironmentTest.java +++ b/src/test/java/emvcardsimulator/PaymentSystemEnvironmentTest.java @@ -38,7 +38,7 @@ public void selectTest() throws CardException { assertEquals(ISO7816.SW_NO_ERROR, (short) response.getSW()); // Reset card setup - response = SmartCard.transmitCommand(new byte[] {(byte) 0xE0, (byte) 0x05, (byte) 0x00, (byte) 0x00, (byte) 0x00}); + response = SmartCard.transmitCommand(new byte[] {(byte) 0x80, (byte) 0x05, (byte) 0x00, (byte) 0x00, (byte) 0x00}); assertEquals(ISO7816.SW_NO_ERROR, (short) response.getSW()); } diff --git a/src/test/java/emvcardsimulator/SimulatorTest.java b/src/test/java/emvcardsimulator/SimulatorTest.java index a47279c..d024eb7 100644 --- a/src/test/java/emvcardsimulator/SimulatorTest.java +++ b/src/test/java/emvcardsimulator/SimulatorTest.java @@ -67,7 +67,7 @@ public void sendApduRequest(byte[] requestApdu) { try { ResponseAPDU response = SmartCard.transmitCommand(requestApdu); sendApduResponse(response.getBytes()); - } catch (CardException e) { + } catch (Exception e) { e.printStackTrace(); throw new RuntimeException(e); } diff --git a/src/test/rust/simulator/Cargo.lock b/src/test/rust/simulator/Cargo.lock index 20a5548..8cad59e 100644 --- a/src/test/rust/simulator/Cargo.lock +++ b/src/test/rust/simulator/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arc-swap" @@ -67,23 +67,32 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cesu8" @@ -99,17 +108,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -124,9 +132,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "derivative" @@ -148,7 +156,7 @@ checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" [[package]] name = "emvpt" version = "0.1.0" -source = "git+https://github.com/mrautio/emvpt#47430c4980ffd41f5fb638321d7b87b676500c87" +source = "git+https://github.com/mrautio/emvpt#c285ab412220631ab3cbffc2e290b8975b9c64ee" dependencies = [ "asn1_der", "chrono", @@ -163,7 +171,7 @@ dependencies = [ "rand_chacha", "regex", "serde", - "serde_yaml 0.9.25", + "serde_yaml 0.9.27", ] [[package]] @@ -195,13 +203,13 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -212,9 +220,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hermit-abi" @@ -249,16 +257,16 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -282,12 +290,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.3", ] [[package]] @@ -327,18 +335,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] [[package]] name = "libc" -version = "0.2.147" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "linked-hash-map" @@ -348,9 +356,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -358,9 +366,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ "serde", ] @@ -399,15 +407,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -420,11 +428,11 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -441,14 +449,14 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.39", ] [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" dependencies = [ "cc", "libc", @@ -458,9 +466,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ "num-traits", ] @@ -477,13 +485,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", "windows-targets", ] @@ -502,18 +510,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -550,27 +558,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -580,9 +579,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -591,9 +590,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "ryu" @@ -618,9 +617,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.175" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] @@ -637,20 +636,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.175" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -671,11 +670,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -697,9 +696,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "syn" @@ -714,9 +713,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -734,43 +733,31 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.39", ] [[package]] name = "thread-id" -version = "4.1.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee93aa2b8331c0fec9091548843f2c90019571814057da3b783f9de09349d73" +checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b" dependencies = [ "libc", - "redox_syscall 0.2.16", - "winapi", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] @@ -785,9 +772,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unsafe-any-ors" @@ -818,20 +805,14 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -840,9 +821,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -850,24 +831,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -875,22 +856,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "winapi" @@ -910,9 +891,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -933,19 +914,19 @@ dependencies = [ ] [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -958,45 +939,45 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "yaml-rust" diff --git a/src/test/rust/simulator/Cargo.toml b/src/test/rust/simulator/Cargo.toml index 0a46754..f7dbaf7 100644 --- a/src/test/rust/simulator/Cargo.toml +++ b/src/test/rust/simulator/Cargo.toml @@ -9,10 +9,10 @@ edition = "2018" [dependencies] emvpt = { git = "https://github.com/mrautio/emvpt", version = "0.1.0" } jni = "0.19.0" -log = "0.4.19" +log = "0.4.20" log4rs = "1.2.0" hex = "0.4.3" -serde = { version = "1.0.175", features = ["derive"] } +serde = { version = "1.0.193", features = ["derive"] } serde_yaml = "0.8.26" [lib] diff --git a/src/test/rust/simulator/src/lib.rs b/src/test/rust/simulator/src/lib.rs index 3061ede..bac6291 100644 --- a/src/test/rust/simulator/src/lib.rs +++ b/src/test/rust/simulator/src/lib.rs @@ -94,7 +94,8 @@ impl ApduRequestResponse { let (response_trailer, _) = connection.send_apdu(&request); if &response_trailer[..] != &response[..] { return Err(format!( - "Response not what expected! expected:{:02X?}, actual:{:02X?}", + "Response not what expected! setup_file:{}, expected:{:02X?}, actual:{:02X?}", + setup_file, &response[..], &response_trailer[..] ));