Split the ec package into common package, rename reader part of the project.

1 files changed, 0 insertions, 52 deletions

diff --git a/src/cz/crcs/ectester/reader/ec/EC_Curve.java b/src/cz/crcs/ectester/reader/ec/EC_Curve.java
deleted file mode 100644
index cb4a2df..0000000
--- a/src/cz/crcs/ectester/reader/ec/EC_Curve.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package cz.crcs.ectester.reader.ec;
-
-import cz.crcs.ectester.applet.EC_Consts;
-import javacard.security.KeyPair;
-
-/**
- * An Elliptic curve, contains parameters Fp/F2M, A, B, G, R, (K)?.
- *
- * @author Jan Jancar johny@neuromancer.sk
- */
-public class EC_Curve extends EC_Params {
-    private short bits;
-    private byte field;
-    private String desc;
-
-    /**
-     * @param bits
-     * @param field KeyPair.ALG_EC_FP or KeyPair.ALG_EC_F2M
-     */
-    public EC_Curve(short bits, byte field) {
-        super(field == KeyPair.ALG_EC_FP ? EC_Consts.PARAMETERS_DOMAIN_FP : EC_Consts.PARAMETERS_DOMAIN_F2M);
-        this.bits = bits;
-        this.field = field;
-    }
-
-    public EC_Curve(String id, short bits, byte field) {
-        this(bits, field);
-        this.id = id;
-    }
-
-    public EC_Curve(String id, short bits, byte field, String desc) {
-        this(id, bits, field);
-        this.desc = desc;
-    }
-
-    public short getBits() {
-        return bits;
-    }
-
-    public byte getField() {
-        return field;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    @Override
-    public String toString() {
-        return "<" + getId() + "> " + (field == KeyPair.ALG_EC_FP ? "Prime" : "Binary") + " field Elliptic curve (" + String.valueOf(bits) + "b)" + (desc == null ? "" : ": " + desc);
-    }
-}