diff --git a/bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java b/bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java index e2ae3cb91..832109779 100644 --- a/bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java +++ b/bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java @@ -40,6 +40,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -50,6 +51,7 @@ import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Nullable; +import javax.crypto.Cipher; import static java.util.Arrays.asList; import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_AGREEMENT_PUBLIC_KEY_BYTES; @@ -335,4 +337,13 @@ public class TestUtils { } return false; } + + public static boolean isCryptoStrengthUnlimited() { + try { + return Cipher.getMaxAllowedKeyLength("AES/CBC/PKCS5Padding") + == Integer.MAX_VALUE; + } catch (NoSuchAlgorithmException e) { + throw new AssertionError(); + } + } } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/BasicHyperSqlTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/BasicHyperSqlTest.java index fae313cf3..4c4d0af02 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/BasicHyperSqlTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/BasicHyperSqlTest.java @@ -3,6 +3,7 @@ package org.briarproject.bramble.db; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.util.StringUtils; +import org.junit.Before; import java.io.File; import java.sql.Connection; @@ -10,10 +11,18 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.sql.Statement; +import static org.briarproject.bramble.test.TestUtils.isCryptoStrengthUnlimited; +import static org.junit.Assume.assumeTrue; + public class BasicHyperSqlTest extends BasicDatabaseTest { private final SecretKey key = TestUtils.getSecretKey(); + @Before + public void setUp() { + assumeTrue(isCryptoStrengthUnlimited()); + } + @Override protected String getBinaryType() { return "BINARY(32)"; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabaseTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabaseTest.java index bf785e31e..90fe79bc9 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabaseTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabaseTest.java @@ -3,9 +3,18 @@ package org.briarproject.bramble.db; import org.briarproject.bramble.api.db.DatabaseConfig; import org.briarproject.bramble.api.sync.MessageFactory; import org.briarproject.bramble.api.system.Clock; +import org.junit.Before; + +import static org.briarproject.bramble.test.TestUtils.isCryptoStrengthUnlimited; +import static org.junit.Assume.assumeTrue; public class HyperSqlDatabaseTest extends JdbcDatabaseTest { + @Before + public void setUp() { + assumeTrue(isCryptoStrengthUnlimited()); + } + @Override protected JdbcDatabase createDatabase(DatabaseConfig config, MessageFactory messageFactory, Clock clock) { diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlMigrationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlMigrationTest.java index f4468728f..66ffeea02 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlMigrationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlMigrationTest.java @@ -1,13 +1,22 @@ package org.briarproject.bramble.db; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.junit.Before; import java.sql.Connection; import java.util.List; +import static org.briarproject.bramble.test.TestUtils.isCryptoStrengthUnlimited; +import static org.junit.Assume.assumeTrue; + @NotNullByDefault public class HyperSqlMigrationTest extends DatabaseMigrationTest { + @Before + public void setUp() { + assumeTrue(isCryptoStrengthUnlimited()); + } + @Override Database createDatabase( List> migrations) {