aboutsummaryrefslogtreecommitdiff
path: root/src/cz/crcs/ectester/reader
diff options
context:
space:
mode:
Diffstat (limited to 'src/cz/crcs/ectester/reader')
-rw-r--r--src/cz/crcs/ectester/reader/Command.java9
-rw-r--r--src/cz/crcs/ectester/reader/ECTester.java27
-rw-r--r--src/cz/crcs/ectester/reader/Response.java29
3 files changed, 49 insertions, 16 deletions
diff --git a/src/cz/crcs/ectester/reader/Command.java b/src/cz/crcs/ectester/reader/Command.java
index c5cef00..92d9da1 100644
--- a/src/cz/crcs/ectester/reader/Command.java
+++ b/src/cz/crcs/ectester/reader/Command.java
@@ -251,6 +251,7 @@ public abstract class Command {
private byte privkey;
private byte export;
private byte corruption;
+ private byte type;
/**
* Creates the INS_ECDH instruction.
@@ -260,15 +261,17 @@ public abstract class Command {
* @param privkey keyPair to use for private key, (KEYPAIR_LOCAL || KEYPAIR_REMOTE)
* @param export whether to export ECDH secret
* @param corruption whether to invalidate the pubkey before ECDH (EC_Consts.CORRUPTION_* || ...)
+ * @param type
*/
- public ECDH(CardMngr cardManager, byte pubkey, byte privkey, byte export, byte corruption) {
+ public ECDH(CardMngr cardManager, byte pubkey, byte privkey, byte export, byte corruption, byte type) {
super(cardManager);
this.pubkey = pubkey;
this.privkey = privkey;
this.export = export;
this.corruption = corruption;
+ this.type = type;
- byte[] data = new byte[]{export, corruption};
+ byte[] data = new byte[]{export, corruption, type};
this.cmd = new CommandAPDU(ECTesterApplet.CLA_ECTESTERAPPLET, ECTesterApplet.INS_ECDH, pubkey, privkey, data);
}
@@ -278,7 +281,7 @@ public abstract class Command {
long elapsed = -System.nanoTime();
ResponseAPDU response = cardManager.send(cmd);
elapsed += System.nanoTime();
- return new Response.ECDH(response, elapsed, pubkey, privkey, export, corruption);
+ return new Response.ECDH(response, elapsed, pubkey, privkey, export, corruption, type);
}
}
diff --git a/src/cz/crcs/ectester/reader/ECTester.java b/src/cz/crcs/ectester/reader/ECTester.java
index e14bb38..ef35b2d 100644
--- a/src/cz/crcs/ectester/reader/ECTester.java
+++ b/src/cz/crcs/ectester/reader/ECTester.java
@@ -85,6 +85,7 @@ public class ECTester {
private String optTestCase;
private int optGenerateAmount;
private int optECDHCount;
+ private byte optECDHKA;
private int optECDSACount;
@@ -145,7 +146,7 @@ public class ECTester {
generate();
} else if (cli.hasOption("test")) {
test();
- } else if (cli.hasOption("ecdh")) {
+ } else if (cli.hasOption("ecdh") || cli.hasOption("ecdhc")) {
ecdh();
} else if (cli.hasOption("ecdsa")) {
ecdsa();
@@ -209,6 +210,7 @@ public class ECTester {
* -g / --generate [amount]
* -t / --test [test_case]
* -dh / --ecdh [count]
+ * -dhc / --ecdhc [count]
* -dsa / --ecdsa [count]
* -ln / --list-named
*
@@ -248,6 +250,7 @@ public class ECTester {
actions.addOption(Option.builder("g").longOpt("generate").desc("Generate [amount] of EC keys.").hasArg().argName("amount").optionalArg(true).build());
actions.addOption(Option.builder("t").longOpt("test").desc("Test ECC support.").hasArg().argName("test_case").optionalArg(true).build());
actions.addOption(Option.builder("dh").longOpt("ecdh").desc("Do ECDH, [count] times.").hasArg().argName("count").optionalArg(true).build());
+ actions.addOption(Option.builder("dhc").longOpt("ecdhc").desc("Do ECDHC, [count] times.").hasArg().argName("count").optionalArg(true).build());
actions.addOption(Option.builder("dsa").longOpt("ecdsa").desc("Sign data with ECDSA, [count] times.").hasArg().argName("count").optionalArg(true).build());
opts.addOptionGroup(actions);
@@ -408,7 +411,7 @@ public class ECTester {
return false;
}
- } else if (cli.hasOption("ecdh")) {
+ } else if (cli.hasOption("ecdh") || cli.hasOption("ecdhc")) {
if (optPrimeField == optBinaryField) {
System.err.print("Need to specify field with -fp or -f2m. (not both)");
return false;
@@ -418,7 +421,13 @@ public class ECTester {
return false;
}
- optECDHCount = Integer.parseInt(cli.getOptionValue("ecdh", "1"));
+ if (cli.hasOption("ecdh")) {
+ optECDHCount = Integer.parseInt(cli.getOptionValue("ecdh", "1"));
+ optECDHKA = EC_Consts.KA_ECDH;
+ } else if (cli.hasOption("ecdhc")) {
+ optECDHCount = Integer.parseInt(cli.getOptionValue("ecdhc", "1"));
+ optECDHKA = EC_Consts.KA_ECDHC;
+ }
if (optECDHCount <= 0) {
System.err.println("ECDH count cannot be <= 0.");
return false;
@@ -697,7 +706,7 @@ public class ECTester {
while (done < optECDHCount) {
List<Response> ecdh = Command.sendAll(generate);
- Response.ECDH perform = new Command.ECDH(cardManager, pubkey, privkey, ECTesterApplet.EXPORT_TRUE, (byte) 0).send();
+ Response.ECDH perform = new Command.ECDH(cardManager, pubkey, privkey, ECTesterApplet.EXPORT_TRUE, EC_Consts.CORRUPTION_NONE, optECDHKA).send();
ecdh.add(perform);
systemOutLogger.println(Response.toString(ecdh));
@@ -921,11 +930,11 @@ public class ECTester {
private List<Command> testCurve() throws IOException {
List<Command> commands = new LinkedList<>();
commands.add(new Command.Generate(cardManager, ECTesterApplet.KEYPAIR_BOTH));
- commands.add(new Command.ECDH(cardManager, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.EXPORT_FALSE, EC_Consts.CORRUPTION_NONE));
- commands.add(new Command.ECDH(cardManager, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.EXPORT_FALSE, EC_Consts.CORRUPTION_ONE));
- commands.add(new Command.ECDH(cardManager, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.EXPORT_FALSE, EC_Consts.CORRUPTION_ZERO));
- commands.add(new Command.ECDH(cardManager, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.EXPORT_FALSE, EC_Consts.CORRUPTION_MAX));
- commands.add(new Command.ECDH(cardManager, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.EXPORT_FALSE, EC_Consts.CORRUPTION_FULLRANDOM));
+ commands.add(new Command.ECDH(cardManager, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.EXPORT_FALSE, EC_Consts.CORRUPTION_NONE, EC_Consts.KA_ECDH));
+ commands.add(new Command.ECDH(cardManager, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.EXPORT_FALSE, EC_Consts.CORRUPTION_ONE, EC_Consts.KA_ECDH));
+ commands.add(new Command.ECDH(cardManager, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.EXPORT_FALSE, EC_Consts.CORRUPTION_ZERO, EC_Consts.KA_ECDH));
+ commands.add(new Command.ECDH(cardManager, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.EXPORT_FALSE, EC_Consts.CORRUPTION_MAX, EC_Consts.KA_ECDH));
+ commands.add(new Command.ECDH(cardManager, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.EXPORT_FALSE, EC_Consts.CORRUPTION_FULLRANDOM, EC_Consts.KA_ECDH));
commands.add(new Command.ECDSA(cardManager, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.EXPORT_FALSE, null));
return commands;
}
diff --git a/src/cz/crcs/ectester/reader/Response.java b/src/cz/crcs/ectester/reader/Response.java
index 691bc5a..92d1b9f 100644
--- a/src/cz/crcs/ectester/reader/Response.java
+++ b/src/cz/crcs/ectester/reader/Response.java
@@ -118,6 +118,10 @@ public abstract class Response {
public abstract String toString();
public static String toString(List<Response> responses) {
+ return toString(responses, null);
+ }
+
+ public static String toString(List<Response> responses, String prefix) {
StringBuilder out = new StringBuilder();
for (int i = 0; i < responses.size(); ++i) {
Response r = responses.get(i);
@@ -129,6 +133,10 @@ public abstract class Response {
} else {
suffix = String.format("%s %s", Util.getSWString(r.getSW1()), Util.getSWString(r.getSW2()));
}
+
+ if (prefix != null)
+ out.append(prefix);
+
out.append(String.format("%-58s:%4d ms : %s", message, r.time / 1000000, suffix));
if (i < responses.size() - 1) {
out.append("\n");
@@ -423,13 +431,15 @@ public abstract class Response {
private byte privkey;
private byte export;
private byte corruption;
+ private byte type;
- protected ECDH(ResponseAPDU response, long time, byte pubkey, byte privkey, byte export, byte corruption) {
+ protected ECDH(ResponseAPDU response, long time, byte pubkey, byte privkey, byte export, byte corruption, byte type) {
super(response, time);
this.pubkey = pubkey;
this.privkey = privkey;
this.export = export;
this.corruption = corruption;
+ this.type = type;
parse(1, (export == ECTesterApplet.EXPORT_TRUE) ? 1 : 0);
}
@@ -444,16 +454,27 @@ public abstract class Response {
@Override
public String toString() {
+ String algo = "";
+ if ((type & EC_Consts.KA_ECDH) != 0) {
+ algo += "ECDH";
+ }
+ if (type == EC_Consts.KA_BOTH) {
+ algo += "+";
+ }
+ if ((type & EC_Consts.KA_ECDHC) != 0) {
+ algo += "ECDHC";
+ }
+
String pub = pubkey == ECTesterApplet.KEYPAIR_LOCAL ? "local" : "remote";
String priv = privkey == ECTesterApplet.KEYPAIR_LOCAL ? "local" : "remote";
- String validity;
+ String validity;
if (corruption == EC_Consts.CORRUPTION_NONE) {
- validity = "valid";
+ validity = "unchanged";
} else {
validity = Util.getCorruption(corruption);
}
- return String.format("ECDH of %s pubkey and %s privkey(%s point)", pub, priv, validity);
+ return String.format("%s of %s pubkey and %s privkey(%s point)", algo, pub, priv, validity);
}
}
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2026-01-01 08:29:06 +0000