Fix releasing memory in LibTomCrypt shim, fix ECDH time measurement.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/cz/crcs/ectester/standalone/ECTesterStandalone.java b/src/cz/crcs/ectester/standalone/ECTesterStandalone.java
index 9df6c61..c3d42dc 100644
--- a/src/cz/crcs/ectester/standalone/ECTesterStandalone.java
+++ b/src/cz/crcs/ectester/standalone/ECTesterStandalone.java
@@ -320,12 +320,14 @@ public class ECTesterStandalone {
                 elapsed += System.nanoTime();
                 SecretKey derived;
                 byte[] result;
+                elapsed -= System.nanoTime();
                 if (kaIdent.requiresKeyAlgo()) {
                     derived = ka.generateSecret(keyAlgo);
                     result = derived.getEncoded();
                 } else {
                     result = ka.generateSecret();
                 }
+                elapsed += System.nanoTime();
                 ka = kaIdent.getInstance(lib.getProvider());
 
                 String pub = ByteUtil.bytesToHex(ECUtil.toX962Uncompressed(pubkey.getW(), pubkey.getParams()), false);