1 files changed, 12 insertions, 10 deletions

diff --git a/src/cz/crcs/ectester/reader/ec/EC_KAResult.java b/src/cz/crcs/ectester/common/ec/EC_KAResult.java
index 4a67bbe..8a5fcb4 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_KAResult.java
+++ b/src/cz/crcs/ectester/common/ec/EC_KAResult.java
@@ -1,6 +1,6 @@
-package cz.crcs.ectester.reader.ec;
+package cz.crcs.ectester.common.ec;
 
-import cz.crcs.ectester.reader.Util;
+import cz.crcs.ectester.common.util.CardUtil;
 
 /**
  * A result of EC based Key agreement operation.
@@ -8,15 +8,14 @@ import cz.crcs.ectester.reader.Util;
  * @author Jan Jancar johny@neuromancer.sk
  */
 public class EC_KAResult extends EC_Data {
-
-    private byte ka;
+    private String ka;
     private String curve;
     private String oneKey;
     private String otherKey;
 
     private String desc;
 
-    public EC_KAResult(byte ka, String curve, String oneKey, String otherKey) {
+    public EC_KAResult(String ka, String curve, String oneKey, String otherKey) {
         super(1);
         this.ka = ka;
         this.curve = curve;
@@ -24,20 +23,24 @@ public class EC_KAResult extends EC_Data {
         this.otherKey = otherKey;
     }
 
-    public EC_KAResult(String id, byte ka, String curve, String oneKey, String otherKey) {
+    public EC_KAResult(String id, String ka, String curve, String oneKey, String otherKey) {
         this(ka, curve, oneKey, otherKey);
         this.id = id;
     }
 
-    public EC_KAResult(String id, byte ka, String curve, String oneKey, String otherKey, String desc) {
+    public EC_KAResult(String id, String ka, String curve, String oneKey, String otherKey, String desc) {
         this(id, ka, curve, oneKey, otherKey);
         this.desc = desc;
     }
 
-    public byte getKA() {
+    public String getKA() {
         return ka;
     }
 
+    public byte getJavaCardKA() {
+        return CardUtil.getKA(ka);
+    }
+
     public String getCurve() {
         return curve;
     }
@@ -56,8 +59,7 @@ public class EC_KAResult extends EC_Data {
 
     @Override
     public String toString() {
-        String algo = Util.getKA(ka);
-        return "<" + getId() + "> " + algo + " result over " + curve + ", " + oneKey + " + " + otherKey + (desc == null ? "" : ": " + desc);
+        return "<" + getId() + "> " + ka + " result over " + curve + ", " + oneKey + " + " + otherKey + (desc == null ? "" : ": " + desc);
     }
 
 }