From bfb858d5e2036c2d4953177c4298ab76e0490ae0 Mon Sep 17 00:00:00 2001 From: aaron-kumar Date: Sun, 24 Sep 2023 21:24:17 +0530 Subject: [PATCH] Docker specific changes and restoration of orignal keysize --- .github/workflows/build-docker.yml | 2 +- .github/workflows/publish-docker.yml | 2 +- .../java/network/oxalis/statistics/security/EncryptionTest.java | 2 +- .../java/network/oxalis/statistics/security/SignatureTest.java | 2 +- .../main/java/network/oxalis/test/security/CertificateMock.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index c254a707c..df0bccd2d 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -41,7 +41,7 @@ jobs: file: ./Dockerfile platforms: linux/amd64,linux/arm64/v8 push: true - tags: norstella/oxalis:6.0.0-latest-java11 + tags: norstella/oxalis:6.1.1-latest cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index ac3b27f09..0c94539c9 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -64,7 +64,7 @@ jobs: file: ./Dockerfile platforms: linux/amd64,linux/arm64/v8 push: true - tags: norstella/oxalis:6.0.0 + tags: norstella/oxalis:6.1.1 cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/EncryptionTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/EncryptionTest.java index 66f5cecfd..34a965fb9 100644 --- a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/EncryptionTest.java +++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/EncryptionTest.java @@ -49,7 +49,7 @@ public class EncryptionTest { @BeforeClass public void createKeyPair() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException { KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA"); - keyPairGenerator.initialize(2048); // Medium security is fine + keyPairGenerator.initialize(1024); // Medium security is fine keyPair = keyPairGenerator.generateKeyPair(); KeyGenerator keyGenerator = KeyGenerator.getInstance("DES"); diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/SignatureTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/SignatureTest.java index 0978db254..08e254517 100644 --- a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/SignatureTest.java +++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/SignatureTest.java @@ -99,7 +99,7 @@ private byte[] encrypt(KeyPair keyPair) throws NoSuchAlgorithmException, NoSuchP private KeyPair generateKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException { KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("DSA"); SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG", "SUN"); - keyPairGenerator.initialize(2048, secureRandom); + keyPairGenerator.initialize(1024, secureRandom); return keyPairGenerator.generateKeyPair(); } diff --git a/oxalis-test/src/main/java/network/oxalis/test/security/CertificateMock.java b/oxalis-test/src/main/java/network/oxalis/test/security/CertificateMock.java index 6ddffe5dc..20dcf5d8f 100644 --- a/oxalis-test/src/main/java/network/oxalis/test/security/CertificateMock.java +++ b/oxalis-test/src/main/java/network/oxalis/test/security/CertificateMock.java @@ -44,7 +44,7 @@ public class CertificateMock { public static X509Certificate withCN(String cn) { try { KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA", "BC"); - keyPairGenerator.initialize(2048, new SecureRandom()); // No ment to be secure! + keyPairGenerator.initialize(1024, new SecureRandom()); // No ment to be secure! KeyPair keyPair = keyPairGenerator.generateKeyPair();