diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 4726e5135..b78975703 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,8 +35,8 @@ jobs: continue-on-error: ${{ matrix.experimental }} strategy: matrix: - # ubuntu-latest uses OpenSSL 3 which breaks tests - os: [macos-latest, ubuntu-20.04, windows-latest] + # macos-latest and ubuntu-latest uses OpenSSL 3 which breaks tests + os: [macos-11, ubuntu-20.04, windows-latest] java: [ 8, 11, 17 ] experimental: [false] # include: diff --git a/src/test/java/org/apache/commons/crypto/AbstractBenchmark.java b/src/test/java/org/apache/commons/crypto/AbstractBenchmark.java index 7d6dfe9fb..043002bce 100644 --- a/src/test/java/org/apache/commons/crypto/AbstractBenchmark.java +++ b/src/test/java/org/apache/commons/crypto/AbstractBenchmark.java @@ -29,7 +29,6 @@ import org.apache.commons.crypto.random.CryptoRandom; import org.apache.commons.crypto.random.CryptoRandomFactory; import org.apache.commons.crypto.utils.AES; -import org.apache.commons.crypto.utils.Utils; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -39,7 +38,7 @@ public abstract class AbstractBenchmark { 0x09, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16 }; private static final byte[] IV = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 }; - private static final SecretKeySpec keySpec = Utils.newSecretKeySpec(KEY); + private static final SecretKeySpec keySpec = AES.newSecretKeySpec(KEY); private static final IvParameterSpec ivSpec = new IvParameterSpec(IV); private static final byte[] BUFFER = new byte[1000];