Skip to content

Commit

Permalink
Remove IPPCP from tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
J08nY committed Jan 31, 2025
1 parent e267fa0 commit b582d30
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
14 changes: 14 additions & 0 deletions standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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");
Expand All @@ -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");
Expand All @@ -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":
Expand All @@ -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");
Expand All @@ -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");
Expand All @@ -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");
Expand All @@ -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"));

Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand All @@ -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":
Expand All @@ -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":
Expand All @@ -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":
Expand Down Expand Up @@ -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};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -24,6 +25,7 @@ static Stream<String> 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":
Expand Down Expand Up @@ -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":
Expand Down Expand Up @@ -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":
Expand Down

0 comments on commit b582d30

Please sign in to comment.