From 01a01d92ea9a71df5d3ae149354369b3fb94cd4d Mon Sep 17 00:00:00 2001 From: Alex Remily Date: Sun, 27 Aug 2023 10:38:57 -0400 Subject: [PATCH 1/3] Fix unknown method error. --- src/test/java/org/apache/commons/crypto/AbstractBenchmark.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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]; From 532d2f67bc80a4a5061f21b9aadb695092bb0db4 Mon Sep 17 00:00:00 2001 From: Alex Remily Date: Sun, 27 Aug 2023 11:16:45 -0400 Subject: [PATCH 2/3] Set MacOS runner version to 11. --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 87d820179..6e0b59a14 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -36,7 +36,7 @@ jobs: strategy: matrix: # ubuntu-latest uses OpenSSL 3 which breaks tests - os: [macos-latest, ubuntu-20.04, windows-latest] + os: [macos-11, ubuntu-20.04, windows-latest] java: [ 8, 11, 17 ] experimental: [false] # include: From dcaf7fb14569bfa68bede18ae80f4ec2b61e1117 Mon Sep 17 00:00:00 2001 From: Alex Remily Date: Sun, 27 Aug 2023 11:20:42 -0400 Subject: [PATCH 3/3] Update comment. --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6e0b59a14..e71bc9557 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: continue-on-error: ${{ matrix.experimental }} strategy: matrix: - # ubuntu-latest uses OpenSSL 3 which breaks tests + # 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]