1 files changed, 31 insertions, 3 deletions
diff --git a/src/cz/crcs/ectester/applet/ECKeyGenerator.java b/src/cz/crcs/ectester/applet/ECKeyGenerator.java
index 30910ca..601654a 100644
--- a/src/cz/crcs/ectester/applet/ECKeyGenerator.java
+++ b/src/cz/crcs/ectester/applet/ECKeyGenerator.java
@@ -4,9 +4,7 @@ import javacard.framework.CardRuntimeException;
 import javacard.framework.ISO7816;
 import javacard.framework.ISOException;
 import javacard.framework.Util;
-import javacard.security.ECPrivateKey;
-import javacard.security.ECPublicKey;
-import javacard.security.KeyPair;
+import javacard.security.*;
 
 /**
  * @author Jan Jancar johny@neuromancer.sk
@@ -42,6 +40,36 @@ public class ECKeyGenerator {
     }
 
     /**
+     * @param keyClass
+     * @param keyLength
+     * @return
+     */
+    public KeyPair constructPair(byte keyClass, short keyLength) {
+        sw = ISO7816.SW_NO_ERROR;
+        KeyPair ecKeyPair = null;
+        byte privKeyType;
+        byte pubKeyType;
+        if (keyClass == KeyPair.ALG_EC_FP) {
+            privKeyType = KeyBuilder.TYPE_EC_FP_PRIVATE;
+            pubKeyType = KeyBuilder.TYPE_EC_FP_PUBLIC;
+        } else {
+            privKeyType = KeyBuilder.TYPE_EC_F2M_PRIVATE;
+            pubKeyType = KeyBuilder.TYPE_EC_F2M_PUBLIC;
+        }
+        try {
+            if (!dryRun) {
+                ECPrivateKey privateKey = (ECPrivateKey) KeyBuilder.buildKey(privKeyType, keyLength, false);
+                ECPublicKey publicKey = (ECPublicKey) KeyBuilder.buildKey(pubKeyType, keyLength, false);
+
+                ecKeyPair = new KeyPair(publicKey, privateKey);
+            }
+        } catch (CardRuntimeException ce) {
+            sw = ce.getReason();
+        }
+        return ecKeyPair;
+    }
+
+    /**
      * @param keypair
      * @param key
      * @return