aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ08nY2020-08-09 18:35:34 +0200
committerJ08nY2020-08-09 18:35:34 +0200
commit29cbf18270a3272ac34b5a4a6790dd3dcd2ca576 (patch)
treefe1913f9909c44c04095050c6bff90165511925a
parent515d65ecfbce93713679d476d4ccaa996a11d061 (diff)
downloadECTester-29cbf18270a3272ac34b5a4a6790dd3dcd2ca576.tar.gz
ECTester-29cbf18270a3272ac34b5a4a6790dd3dcd2ca576.tar.zst
ECTester-29cbf18270a3272ac34b5a4a6790dd3dcd2ca576.zip
Fix reader allocation commands.
-rw-r--r--docs/LIBS.md2
-rw-r--r--src/cz/crcs/ectester/reader/ECTesterReader.java8
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/LIBS.md b/docs/LIBS.md
index b9d1db9..7baec65 100644
--- a/docs/LIBS.md
+++ b/docs/LIBS.md
@@ -4,7 +4,7 @@ Libraries that ECTester can test.
- [BouncyCastle](https://bouncycastle.org/java.html)
- Java
- - Works with the short Weierstrass curve model.
+ - Works with the short Weierstrass curve model for ECDSA and ECDH.
- Works with coordinates:
- Affine
- Projective(Homogenous)
diff --git a/src/cz/crcs/ectester/reader/ECTesterReader.java b/src/cz/crcs/ectester/reader/ECTesterReader.java
index 7953c1b..7bd7d42 100644
--- a/src/cz/crcs/ectester/reader/ECTesterReader.java
+++ b/src/cz/crcs/ectester/reader/ECTesterReader.java
@@ -395,7 +395,7 @@ public class ECTesterReader {
byte keyClass = cfg.primeField ? KeyPair.ALG_EC_FP : KeyPair.ALG_EC_F2M;
List<Response> sent = new LinkedList<>();
- sent.add(new Command.Allocate(cardManager, cfg.keyBuilder, ECTesterApplet.KEYPAIR_LOCAL, cfg.bits, keyClass).send());
+ sent.add(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_LOCAL, cfg.keyBuilder, cfg.bits, keyClass).send());
//sent.add(new Command.Clear(cardManager, ECTesterApplet.KEYPAIR_LOCAL).send());
sent.add(new Command.Generate(cardManager, ECTesterApplet.KEYPAIR_LOCAL).send());
@@ -445,7 +445,7 @@ public class ECTesterReader {
byte keyClass = cfg.primeField ? KeyPair.ALG_EC_FP : KeyPair.ALG_EC_F2M;
Command curve = Command.prepareCurve(cardManager, cfg, ECTesterApplet.KEYPAIR_LOCAL, cfg.bits, keyClass);
- Response allocate = new Command.Allocate(cardManager, cfg.keyBuilder, ECTesterApplet.KEYPAIR_LOCAL, cfg.bits, keyClass).send();
+ Response allocate = new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_LOCAL, cfg.keyBuilder, cfg.bits, keyClass).send();
respWriter.outputResponse(allocate);
OutputStreamWriter keysFile = FileUtil.openFiles(cfg.outputs);
@@ -578,7 +578,7 @@ public class ECTesterReader {
Command curve = Command.prepareCurve(cardManager, cfg, ECTesterApplet.KEYPAIR_BOTH, cfg.bits, keyClass);
List<Response> prepare = new LinkedList<>();
prepare.add(new Command.AllocateKeyAgreement(cardManager, cfg.ECKAType).send()); // Prepare KeyAgreement or required type
- prepare.add(new Command.Allocate(cardManager, cfg.keyBuilder, ECTesterApplet.KEYPAIR_BOTH, cfg.bits, keyClass).send());
+ prepare.add(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, cfg.keyBuilder, cfg.bits, keyClass).send());
if (curve != null)
prepare.add(curve.send());
@@ -704,7 +704,7 @@ public class ECTesterReader {
byte keyClass = cfg.primeField ? KeyPair.ALG_EC_FP : KeyPair.ALG_EC_F2M;
List<Response> prepare = new LinkedList<>();
prepare.add(new Command.AllocateSignature(cardManager, cfg.ECDSAType).send());
- prepare.add(new Command.Allocate(cardManager, cfg.keyBuilder, ECTesterApplet.KEYPAIR_LOCAL, cfg.bits, keyClass).send());
+ prepare.add(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_LOCAL, cfg.keyBuilder, cfg.bits, keyClass).send());
Command curve = Command.prepareCurve(cardManager, cfg, ECTesterApplet.KEYPAIR_LOCAL, cfg.bits, keyClass);
if (curve != null)
prepare.add(curve.send());