Add various ECDSA tests.

2 files changed, 21 insertions, 0 deletions

diff --git a/src/cz/crcs/ectester/common/util/CardUtil.java b/src/cz/crcs/ectester/common/util/CardUtil.java
index a628d5b..e7b370c 100644
--- a/src/cz/crcs/ectester/common/util/CardUtil.java
+++ b/src/cz/crcs/ectester/common/util/CardUtil.java
@@ -14,6 +14,23 @@ import java.util.List;
  * @author Jan Jancar johny@neuromancer.sk
  */
 public class CardUtil {
+    public static byte getSig(String name) {
+        switch (name) {
+            case "SHA1":
+                return EC_Consts.Signature_ALG_ECDSA_SHA;
+            case "SHA224":
+                return EC_Consts.Signature_ALG_ECDSA_SHA_224;
+            case "SHA256":
+                return EC_Consts.Signature_ALG_ECDSA_SHA_256;
+            case "SHA384":
+                return EC_Consts.Signature_ALG_ECDSA_SHA_384;
+            case "SHA512":
+                return EC_Consts.Signature_ALG_ECDSA_SHA_512;
+            default:
+                return EC_Consts.Signature_ALG_ECDSA_SHA;
+        }
+    }
+
     public static byte getKA(String name) {
         switch (name) {
             case "DH":
diff --git a/src/cz/crcs/ectester/common/util/ECUtil.java b/src/cz/crcs/ectester/common/util/ECUtil.java
index 3c1f138..6c3ad58 100644
--- a/src/cz/crcs/ectester/common/util/ECUtil.java
+++ b/src/cz/crcs/ectester/common/util/ECUtil.java
@@ -210,4 +210,8 @@ public class ECUtil {
         ECPrivateKey privkey = new RawECPrivateKey(toScalar(kp), curve.toSpec());
         return new KeyPair(pubkey, privkey);
     }
+
+    public static byte[] toDERSignature(byte[] r, byte[] s) {
+        return ByteUtil.concatenate(new byte[]{0x30, (byte) (r.length + s.length + 4), 0x02, (byte) r.length}, r, new byte[]{0x02, (byte) s.length}, s);
+    }
 }