From 956a7eb85ea4ccae18b54d4f1cd7e506a5555e5b Mon Sep 17 00:00:00 2001 From: Martin Paljak Date: Tue, 5 Mar 2024 00:03:09 +0200 Subject: [PATCH] wip for expfiles --- task/src/main/java/pro/javacard/ant/DummyMain.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/task/src/main/java/pro/javacard/ant/DummyMain.java b/task/src/main/java/pro/javacard/ant/DummyMain.java index 52b16e0..301846b 100644 --- a/task/src/main/java/pro/javacard/ant/DummyMain.java +++ b/task/src/main/java/pro/javacard/ant/DummyMain.java @@ -22,6 +22,7 @@ package pro.javacard.ant; import pro.javacard.capfile.CAPFile; +import pro.javacard.sdk.ExportFileHelper; import pro.javacard.sdk.JavaCardSDK; import pro.javacard.sdk.OffCardVerifier; import pro.javacard.sdk.VerifierError; @@ -48,16 +49,22 @@ public static void main(String[] argv) { System.exit(1); } else if (args.size() == 1) { final String capfile = args.remove(0); - if (Files.isRegularFile(Paths.get(capfile)) && capfile.endsWith(".cap")) { + + Path path = Paths.get(capfile); + if (capfile.endsWith(".exp")) { + System.err.println("Expfile version: " + ExportFileHelper.getVersion(path)); + System.exit(1); + } + if (Files.isRegularFile(path) && capfile.endsWith(".cap")) { try { - CAPFile cap = CAPFile.fromBytes(Files.readAllBytes(Paths.get(capfile))); + CAPFile cap = CAPFile.fromBytes(Files.readAllBytes(path)); cap.dump(System.out); } catch (Exception e) { System.err.printf("Failed to read/parse CAP file: %s: %s%n", e.getClass().getSimpleName(), e.getMessage()); System.exit(1); } } else { - System.err.println("Usage: java -jar ant-javacard.jar "); + System.err.println("Usage: java -jar ant-javacard.jar "); System.exit(1); } } else {