diff --git a/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java b/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java index 1ff95565..56366364 100644 --- a/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java +++ b/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java @@ -89,6 +89,7 @@ String[] buildCLIArgs(String libName, String suite, String... additional) { @MethodSource("libs") @StdIo() public void defaultSuite(String libName, StdOut out) { + assumeFalse(libName.equals("IPPCP")); String[] args = buildCLIArgs(libName, "default"); if (libName.equals("Botan") || libName.equals("Crypto++")) { args = buildCLIArgs(libName, "default", "--kpg-type", "ECDH"); @@ -108,6 +109,7 @@ public void defaultSuite(String libName, StdOut out) { @MethodSource("libs") @StdIo() public void testVectorSuite(String libName, StdOut out) { + assumeFalse(libName.equals("IPPCP")); String[] args = buildCLIArgs(libName, "test-vectors"); if (libName.equals("Botan") || libName.equals("Crypto++")) { args = buildCLIArgs(libName, "test-vectors", "--kpg-type", "ECDH"); @@ -122,6 +124,7 @@ public void testVectorSuite(String libName, StdOut out) { @ParameterizedTest @MethodSource("libs") public void performanceSuite(String libName) { + assumeFalse(libName.equals("IPPCP")); String[] args = buildCLIArgs(libName, "performance"); if (libName.equals("Botan") || libName.equals("Crypto++")) { args = buildCLIArgs(libName, "performance", "--kpg-type", "ECDH"); @@ -142,6 +145,7 @@ public void performanceSuite(String libName) { @ParameterizedTest @MethodSource("libs") public void signatureSuite(String libName) { + assumeFalse(libName.equals("IPPCP")); String[] args = buildCLIArgs(libName, "signature", "-q"); switch (libName) { case "Nettle": @@ -161,6 +165,7 @@ public void signatureSuite(String libName) { @ParameterizedTest @MethodSource("libs") public void miscSuite(String libName) { + assumeFalse(libName.equals("IPPCP")); String[] args = buildCLIArgs(libName, "miscellaneous", "-q"); if (libName.equals("Botan") || libName.equals("Crypto++")) { args = buildCLIArgs(libName, "miscellaneous", "--kpg-type", "ECDH", "-q"); @@ -171,6 +176,7 @@ public void miscSuite(String libName) { @ParameterizedTest @MethodSource("libs") public void twistSuite(String libName) { + assumeFalse(libName.equals("IPPCP")); String[] args = buildCLIArgs(libName, "twist", "-q"); if (libName.equals("Botan") || libName.equals("Crypto++")) { args = buildCLIArgs(libName, "twist", "--kpg-type", "ECDH", "-q"); @@ -181,6 +187,7 @@ public void twistSuite(String libName) { @ParameterizedTest @MethodSource("libs") public void degenerateSuite(String libName) { + assumeFalse(libName.equals("IPPCP")); String[] args = buildCLIArgs(libName, "degenerate", "-q"); if (libName.equals("Botan") || libName.equals("Crypto++")) { args = buildCLIArgs(libName, "degenerate", "--kpg-type", "ECDH", "-q"); @@ -191,6 +198,7 @@ public void degenerateSuite(String libName) { @ParameterizedTest @MethodSource("libs") public void edgeCasesSuite(String libName) { + assumeFalse(libName.equals("IPPCP")); // TODO: Crypto++ and tomcrypt is broken here. assumeFalse(libName.equals("Crypto++") || libName.equals("tomcrypt")); @@ -221,6 +229,7 @@ public void compositeSuite(String libName) { @ParameterizedTest @MethodSource("libs") public void cofactorSuite(String libName) { + assumeFalse(libName.equals("IPPCP")); String[] args = buildCLIArgs(libName, "cofactor", "-q"); if (libName.equals("Botan") || libName.equals("Crypto++")) { args = buildCLIArgs(libName, "cofactor", "--kpg-type", "ECDH", "-q"); @@ -248,6 +257,7 @@ public void wrongSuite(String libName) { @ParameterizedTest @MethodSource("libs") public void invalidSuite(String libName) { + assumeFalse(libName.equals("IPPCP")); String[] args = buildCLIArgs(libName, "invalid", "-q"); if (libName.equals("Botan") || libName.equals("Crypto++")) { args = buildCLIArgs(libName, "invalid", "--kpg-type", "ECDH", "-q"); @@ -260,6 +270,7 @@ public void invalidSuite(String libName) { @MethodSource("libs") @StdIo() public void generate(String libName, StdOut out) { + assumeFalse(libName.equals("IPPCP")); String[] args = new String[]{"generate", "-n", "10", "-nc", "secg/secp256r1", libName}; switch (libName) { case "Botan": @@ -283,6 +294,7 @@ public void generate(String libName, StdOut out) { @MethodSource("libs") @StdIo() public void ecdh(String libName, StdOut out) { + assumeFalse(libName.equals("IPPCP")); String[] args = new String[]{"ecdh", "-n", "10", "-nc", "secg/secp256r1", libName}; switch (libName) { case "Nettle": @@ -302,6 +314,7 @@ public void ecdh(String libName, StdOut out) { @MethodSource("libs") @StdIo() public void ecdsa(String libName, StdOut out) { + assumeFalse(libName.equals("IPPCP")); String[] args = new String[]{"ecdsa", "-n", "10", "-nc", "secg/secp256r1", libName}; switch (libName) { case "Nettle": @@ -330,6 +343,7 @@ public void ecdsa(String libName, StdOut out) { @MethodSource("libs") @StdIo() public void export(String libName, StdOut out) { + assumeFalse(libName.equals("IPPCP")); // TODO: wolfCrypt is weirdly broken here. assumeFalse(libName.contains("wolfCrypt")); String[] args = new String[]{"export", "-b", "256", libName}; diff --git a/standalone/src/test/java/cz/crcs/ectester/standalone/DeterministicTests.java b/standalone/src/test/java/cz/crcs/ectester/standalone/DeterministicTests.java index 5c7a21f4..9f5b3a91 100644 --- a/standalone/src/test/java/cz/crcs/ectester/standalone/DeterministicTests.java +++ b/standalone/src/test/java/cz/crcs/ectester/standalone/DeterministicTests.java @@ -10,6 +10,7 @@ import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeFalse; public class DeterministicTests { @@ -24,6 +25,7 @@ static Stream libs() { @MethodSource("libs") @StdIo() public void generate(String libName, StdOut out) { + assumeFalse(libName.equals("IPPCP")); String[] args = new String[]{"generate", "-ps", "123412341234123412341234123412341234123412341234123412341234123412341234123412341234123412341234", "-n", "10", "-nc", "secg/secp256r1", libName}; switch (libName) { case "Botan": @@ -61,6 +63,7 @@ public void generate(String libName, StdOut out) { @MethodSource("libs") @StdIo() public void ecdh(String libName, StdOut out) { + assumeFalse(libName.equals("IPPCP")); String[] args = new String[]{"ecdh", "-ps", "123412341234123412341234123412341234123412341234123412341234123412341234123412341234123412341234", "-n", "10", "-nc", "secg/secp256r1", libName}; switch (libName) { case "Nettle": @@ -96,6 +99,7 @@ public void ecdh(String libName, StdOut out) { @MethodSource("libs") @StdIo() public void ecdsa(String libName, StdOut out) { + assumeFalse(libName.equals("IPPCP")); String[] args = new String[]{"ecdsa", "-ps", "123412341234123412341234123412341234123412341234123412341234123412341234123412341234123412341234", "-d", "1234", "-n", "10", "-nc", "secg/secp256r1", libName}; switch (libName) { case "Nettle":