Merge branch 'devel'

1 files changed, 63 insertions, 0 deletions

diff --git a/src/cz/crcs/ectester/common/util/CardUtil.java b/src/cz/crcs/ectester/common/util/CardUtil.java
index e7b370c..7483c32 100644
--- a/src/cz/crcs/ectester/common/util/CardUtil.java
+++ b/src/cz/crcs/ectester/common/util/CardUtil.java
@@ -327,16 +327,22 @@ public class CardUtil {
 
     public static byte getKAType(String kaTypeString) {
         switch (kaTypeString) {
+            case "DH":
             case "ALG_EC_SVDP_DH":
                 return EC_Consts.KeyAgreement_ALG_EC_SVDP_DH;
+            case "DH_PLAIN":
             case "ALG_EC_SVDP_DH_PLAIN":
                 return EC_Consts.KeyAgreement_ALG_EC_SVDP_DH_PLAIN;
+            case "PACE_GM":
             case "ALG_EC_PACE_GM":
                 return EC_Consts.KeyAgreement_ALG_EC_PACE_GM;
+            case "DH_PLAIN_XY":
             case "ALG_EC_SVDP_DH_PLAIN_XY":
                 return EC_Consts.KeyAgreement_ALG_EC_SVDP_DH_PLAIN_XY;
+            case "DHC":
             case "ALG_EC_SVDP_DHC":
                 return EC_Consts.KeyAgreement_ALG_EC_SVDP_DHC;
+            case "DHC_PLAIN":
             case "ALG_EC_SVDP_DHC_PLAIN":
                 return EC_Consts.KeyAgreement_ALG_EC_SVDP_DHC_PLAIN;
             default:
@@ -373,14 +379,19 @@ public class CardUtil {
 
     public static byte getSigType(String sigTypeString) {
         switch (sigTypeString) {
+            case "ECDSA_SHA":
             case "ALG_ECDSA_SHA":
                 return EC_Consts.Signature_ALG_ECDSA_SHA;
+            case "ECDSA_SHA_224":
             case "ALG_ECDSA_SHA_224":
                 return EC_Consts.Signature_ALG_ECDSA_SHA_224;
+            case "ECDSA_SHA_256":
             case "ALG_ECDSA_SHA_256":
                 return EC_Consts.Signature_ALG_ECDSA_SHA_256;
+            case "ECDSA_SHA_384":
             case "ALG_ECDSA_SHA_384":
                 return EC_Consts.Signature_ALG_ECDSA_SHA_384;
+            case "ECDSA_SHA_512":
             case "ALG_ECDSA_SHA_512":
                 return EC_Consts.Signature_ALG_ECDSA_SHA_512;
             default:
@@ -409,6 +420,58 @@ public class CardUtil {
         }
     }
 
+    public static String getCurveName(byte curve) {
+        String result = "";
+        switch (curve) {
+            case EC_Consts.CURVE_default:
+                result = "default";
+                break;
+            case EC_Consts.CURVE_external:
+                result = "external";
+                break;
+            case EC_Consts.CURVE_secp112r1:
+                result = "secp112r1";
+                break;
+            case EC_Consts.CURVE_secp128r1:
+                result = "secp128r1";
+                break;
+            case EC_Consts.CURVE_secp160r1:
+                result = "secp160r1";
+                break;
+            case EC_Consts.CURVE_secp192r1:
+                result = "secp192r1";
+                break;
+            case EC_Consts.CURVE_secp224r1:
+                result = "secp224r1";
+                break;
+            case EC_Consts.CURVE_secp256r1:
+                result = "secp256r1";
+                break;
+            case EC_Consts.CURVE_secp384r1:
+                result = "secp384r1";
+                break;
+            case EC_Consts.CURVE_secp521r1:
+                result = "secp521r1";
+                break;
+            case EC_Consts.CURVE_sect163r1:
+                result = "sect163r1";
+                break;
+            case EC_Consts.CURVE_sect233r1:
+                result = "sect233r1";
+                break;
+            case EC_Consts.CURVE_sect283r1:
+                result = "sect283r1";
+                break;
+            case EC_Consts.CURVE_sect409r1:
+                result = "sect409r1";
+                break;
+            case EC_Consts.CURVE_sect571r1:
+                result = "sect571r1";
+                break;
+        }
+        return result;
+    }
+
     public static String getParameterString(short params) {
         String what = "";
         if (params == EC_Consts.PARAMETERS_DOMAIN_F2M || params == EC_Consts.PARAMETERS_DOMAIN_FP) {