2 files changed, 61 insertions, 49 deletions

diff --git a/common/src/main/java/cz/crcs/ectester/common/util/ECUtil.java b/common/src/main/java/cz/crcs/ectester/common/util/ECUtil.java
index f9be536..74fccc9 100644
--- a/common/src/main/java/cz/crcs/ectester/common/util/ECUtil.java
+++ b/common/src/main/java/cz/crcs/ectester/common/util/ECUtil.java
@@ -2,20 +2,22 @@ package cz.crcs.ectester.common.util;
 
 import cz.crcs.ectester.common.ec.*;
 import cz.crcs.ectester.data.EC_Store;
+import org.bouncycastle.asn1.ASN1OctetString;
+import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.crypto.digests.SHA1Digest;
 import org.bouncycastle.crypto.signers.PlainDSAEncoding;
 import org.bouncycastle.crypto.signers.StandardDSAEncoding;
+import org.bouncycastle.jcajce.interfaces.EdDSAPrivateKey;
+import org.bouncycastle.jcajce.interfaces.EdDSAPublicKey;
+import org.bouncycastle.jcajce.interfaces.XDHPrivateKey;
+import org.bouncycastle.jcajce.interfaces.XDHPublicKey;
 
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
-import java.security.KeyPair;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.interfaces.ECKey;
-import java.security.interfaces.ECPrivateKey;
-import java.security.interfaces.ECPublicKey;
+import java.security.*;
+import java.security.interfaces.*;
 import java.security.spec.*;
 import java.util.LinkedList;
 import java.util.List;
@@ -456,6 +458,46 @@ public class ECUtil {
         return null;
     }
 
+    public static byte[] pubkeyToBytes(PublicKey pubkey) {
+        if (pubkey instanceof ECPublicKey) {
+            ECPublicKey ecPublicKey = (ECPublicKey) pubkey;
+            return ECUtil.toX962Uncompressed(ecPublicKey.getW(), ecPublicKey.getParams());
+        } else if (pubkey instanceof XECPublicKey) {
+            XECPublicKey xedPublicKey = (XECPublicKey) pubkey;
+            return xedPublicKey.getU().toByteArray();
+        } else if (pubkey instanceof EdECPublicKey) {
+            EdECPublicKey edECPublicKey = (EdECPublicKey) pubkey;
+            return edECPublicKey.getPoint().getY().toByteArray();
+        } else if (pubkey instanceof XDHPublicKey) {
+            XDHPublicKey xdhPublicKey = (XDHPublicKey) pubkey;
+            return xdhPublicKey.getU().toByteArray();
+            // Special-case BouncyCastle XDH
+        } else if (pubkey instanceof EdDSAPublicKey) {
+            EdDSAPublicKey edDSAPublicKey = (EdDSAPublicKey) pubkey;
+            // Special-case BouncyCastle EdDSA
+            return edDSAPublicKey.getPointEncoding();
+        }
+        return null;
+    }
+
+    public static byte[] privkeyToBytes(PrivateKey privkey) {
+        if (privkey instanceof ECPrivateKey) {
+            ECPrivateKey ecPrivateKey = (ECPrivateKey) privkey;
+            return ecPrivateKey.getS().toByteArray();
+        } else if (privkey instanceof XECPrivateKey) {
+            XECPrivateKey xecPrivateKey = (XECPrivateKey) privkey;
+            return xecPrivateKey.getScalar().get();
+        } else if (privkey instanceof EdECPrivateKey) {
+            EdECPrivateKey edECPrivateKey = (EdECPrivateKey) privkey;
+            return edECPrivateKey.getBytes().get();
+        } else if (privkey instanceof XDHPrivateKey || privkey instanceof EdDSAPrivateKey) {
+            // Special-case BouncyCastle XDH and EdDSA
+            PrivateKeyInfo xpkinfo = PrivateKeyInfo.getInstance(privkey.getEncoded());
+            return ASN1OctetString.getInstance(xpkinfo.getPrivateKey().getOctets()).getOctets();
+        }
+        return null;
+    }
+
     public static boolean equalKeyPairParameters(ECPrivateKey priv, ECPublicKey pub) {
         if (priv == null || pub == null) {
             return false;
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
index c5693e8..2dc5040 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
@@ -62,6 +62,7 @@ import java.security.interfaces.*;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.ECGenParameterSpec;
 import java.security.spec.ECParameterSpec;
+import java.security.spec.NamedParameterSpec;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -160,8 +161,6 @@ public class ECTesterStandalone {
                 listIdents();
             } else if (cli.isNext("ecdh")) {
                 ecdh();
-            } else if (cli.isNext("xdh")) {
-                xdh();
             } else if (cli.isNext("ecdsa")) {
                 ecdsa();
             } else if (cli.isNext("generate")) {
@@ -236,11 +235,6 @@ public class ECTesterStandalone {
         ParserOptions ecdh = new ParserOptions(new DefaultParser(), ecdhOpts, "Perform EC based KeyAgreement.");
         actions.put("ecdh", ecdh);
 
-        Options xdhOpts = new Options();
-        xdhOpts.addOption(Option.builder("n").longOpt("amount").hasArg().argName("amount").optionalArg(false).desc("Do XDH [amount] times.").build());
-        ParserOptions xdh = new ParserOptions(new DefaultParser(), xdhOpts, "Perform XDH (x25519/x448).");
-        actions.put("xdh", xdh);
-
         Options ecdsaOpts = new Options();
         ecdsaOpts.addOption(bits);
         ecdsaOpts.addOption(namedCurve);
@@ -467,8 +461,8 @@ public class ECTesterStandalone {
             other = kpg.genKeyPair();
         }
 
-        ECPrivateKey privkey = (ECPrivateKey) ECUtil.loadKey(EC_Consts.PARAMETER_S, cli.getOptionValue("ecdh.named-private"), cli.getOptionValue("ecdh.private"), spec);
-        ECPublicKey pubkey = (ECPublicKey) ECUtil.loadKey(EC_Consts.PARAMETER_W, cli.getOptionValue("ecdh.named-public"), cli.getOptionValue("ecdh.public"), spec);
+        PrivateKey privkey = (ECPrivateKey) ECUtil.loadKey(EC_Consts.PARAMETER_S, cli.getOptionValue("ecdh.named-private"), cli.getOptionValue("ecdh.private"), spec);
+        PublicKey pubkey = (ECPublicKey) ECUtil.loadKey(EC_Consts.PARAMETER_W, cli.getOptionValue("ecdh.named-public"), cli.getOptionValue("ecdh.public"), spec);
 
         int amount = Integer.parseInt(cli.getOptionValue("ecdh.amount", "1"));
         for (int i = 0; i < amount || amount == 0; ++i) {
@@ -480,11 +474,11 @@ public class ECTesterStandalone {
             }
 
             if (!cli.hasOption("ecdh.named-private") && !cli.hasOption("ecdh.private")) {
-                privkey = (ECPrivateKey) one.getPrivate();
+                privkey = one.getPrivate();
             }
 
             if (!cli.hasOption("ecdh.named-public") && !cli.hasOption("ecdh.public")) {
-                pubkey = (ECPublicKey) other.getPublic();
+                pubkey = other.getPublic();
             }
 
             long elapsed = -System.nanoTime();
@@ -510,8 +504,8 @@ public class ECTesterStandalone {
             }
             ka = kaIdent.getInstance(lib.getProvider());
 
-            String pub = ByteUtil.bytesToHex(ECUtil.toX962Uncompressed(pubkey.getW(), pubkey.getParams()), false);
-            String priv = ByteUtil.bytesToHex(privkey.getS().toByteArray(), false);
+            String pub = ByteUtil.bytesToHex(ECUtil.pubkeyToBytes(pubkey), false);
+            String priv = ByteUtil.bytesToHex(ECUtil.privkeyToBytes(privkey), false);
             String dh = ByteUtil.bytesToHex(result, false);
             out.printf("%d;%d;%s;%s;%s%n", i, elapsed, pub, priv, dh);
         }
@@ -521,10 +515,6 @@ public class ECTesterStandalone {
         }
     }
 
-    private void xdh() {
-
-    }
-
     /**
      *
      */
@@ -759,30 +749,11 @@ public class ECTesterStandalone {
             }
             PublicKey pubkey = kp.getPublic();
             PrivateKey privkey = kp.getPrivate();
-            String pub;
-            String priv;
-            if (pubkey instanceof ECPublicKey && privkey instanceof ECPrivateKey) {
-                ECPublicKey publicKey = (ECPublicKey) pubkey;
-                ECPrivateKey privateKey = (ECPrivateKey) privkey;
-                pub = ByteUtil.bytesToHex(ECUtil.toX962Uncompressed(publicKey.getW(), publicKey.getParams()), false);
-                priv = ByteUtil.bytesToHex(privateKey.getS().toByteArray(), false);
-            } else if (pubkey instanceof XECPublicKey && privkey instanceof XECPrivateKey) {
-                pub = ByteUtil.bytesToHex(((XECPublicKey) pubkey).getU().toByteArray(), false);
-                priv = ByteUtil.bytesToHex(((XECPrivateKey) privkey).getScalar().get(), false);
-            } else if (pubkey instanceof EdECPublicKey && privkey instanceof EdECPrivateKey) {
-                pub = ByteUtil.bytesToHex(((EdECPublicKey) pubkey).getPoint().getY().toByteArray(), false);
-                priv = ByteUtil.bytesToHex(((EdECPrivateKey) privkey).getBytes().get(), false);
-            } else if (pubkey instanceof XDHPublicKey && privkey instanceof XDHPrivateKey) {
-                // Special-case BouncyCastle XDH
-                pub = ByteUtil.bytesToHex(((XDHPublicKey) pubkey).getU().toByteArray(), false);
-                PrivateKeyInfo pkinfo = PrivateKeyInfo.getInstance(privkey.getEncoded());
-                priv = ByteUtil.bytesToHex(ASN1OctetString.getInstance(pkinfo.getPrivateKey().getOctets()).getOctets(), false);
-            } else if (pubkey instanceof EdDSAPublicKey && privkey instanceof EdDSAPrivateKey) {
-                // Special-case BouncyCastle EdDSA
-                pub = ByteUtil.bytesToHex(((EdDSAPublicKey) pubkey).getPointEncoding(), false);
-                PrivateKeyInfo pkinfo = PrivateKeyInfo.getInstance(privkey.getEncoded());
-                priv = ByteUtil.bytesToHex(ASN1OctetString.getInstance(pkinfo.getPrivateKey().getOctets()).getOctets(), false);
-            } else {
+            byte[] pubBytes = ECUtil.pubkeyToBytes(pubkey);
+            byte[] privBytes = ECUtil.privkeyToBytes(privkey);
+            String pub = ByteUtil.bytesToHex(pubBytes, false);
+            String priv = ByteUtil.bytesToHex(privBytes, false);
+            if (pubBytes == null || privBytes == null) {
                 System.err.println(pubkey.getClass().getCanonicalName());
                 System.err.println(privkey.getClass().getCanonicalName());
                 break;
@@ -801,7 +772,6 @@ public class ECTesterStandalone {
     private void test() throws TestException, ParserConfigurationException, FileNotFoundException {
         TestWriter writer = new FileTestWriter(cli.getOptionValue("test.format", "text"), !cli.hasOption("test.quiet"), cli.getOptionValues("test.output"));
         StandaloneTestSuite suite;
-
         switch (cli.getArg(0).toLowerCase()) {
             case "test-vectors":
                 suite = new StandaloneTestVectorSuite(writer, cfg, cli);
@@ -836,9 +806,9 @@ public class ECTesterStandalone {
             case "performance":
                 suite = new StandalonePerformanceSuite(writer, cfg, cli);
                 break;
-            case "default":
             default:
                 suite = new StandaloneDefaultSuite(writer, cfg, cli);
+                break;
         }
 
         suite.run();