Merge branch 'master' into build-with-nix

Author: quapka

standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java

@@ -94,6 +94,9 @@ public void defaultSuite(String libName, StdOut out) {
         if (libName.equals("Botan") || libName.equals("Crypto++")) {
             args = buildCLIArgs(libName, "default", "--kpg-type", "ECDH");
         }
+        if (libName.equals("wolfCrypt")) {
+        	args = buildCLIArgs(libName, "default", "-b", "256");
+        }
         ECTesterStandalone.main(args);
         String sout = out.capturedString();
         if (sout.contains("Exception")) {
@@ -124,6 +127,9 @@ public void performanceSuite(String libName) {
         if (libName.equals("Botan") || libName.equals("Crypto++")) {
             args = buildCLIArgs(libName, "performance", "--kpg-type", "ECDH");
         }
+        if (libName.equals("wolfCrypt")) {
+        	args = buildCLIArgs(libName, "performance", "-b", "256");
+        }
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         PrintStream ps = new PrintStream(baos);
         System.setOut(ps);