Merge pull request #39 from crocs-muni/epare

Add epare artifact

1 files changed, 12 insertions, 2 deletions

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 96052f1..2708e13 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
@@ -575,16 +575,26 @@ public class ECTesterStandalone {
             } else {
                 ka.init(privkey, random);
             }
-            ka.doPhase(pubkey, true);
-            elapsed += System.nanoTime();
             SecretKey derived;
             byte[] result;
+            try {
+            ka.doPhase(pubkey, true);
+            elapsed += System.nanoTime();
+            
             elapsed -= System.nanoTime();
+            
             if (kaIdent.requiresKeyAlgo()) {
                 derived = ka.generateSecret(keyAlgo);
                 result = derived.getEncoded();
             } else {
                 result = ka.generateSecret();
+            }} catch (Exception e){
+                String pub = ByteUtil.bytesToHex(ECUtil.pubkeyToBytes(pubkey), false);
+                String priv = ByteUtil.bytesToHex(ECUtil.privkeyToBytes(privkey), false);
+                out.printf("%d;%d;%s;%s;%d%n", i, 0, pub, priv, 0);
+                ka = kaIdent.getInstance(lib.getProvider());
+                continue;
+
             }
             elapsed += System.nanoTime();
             if (!lib.getNativeTimingSupport().isEmpty()) {