From b048c281258f7733d51deaf8d571df26a94f525a Mon Sep 17 00:00:00 2001 From: Adel El-Beik Date: Fri, 27 Sep 2024 09:58:51 +0100 Subject: [PATCH 1/4] ENT-12072: Reverted BC --- constants.properties | 2 +- core-deterministic/build.gradle | 4 ++-- core/build.gradle | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/constants.properties b/constants.properties index 01c1df95c4..119bf179b3 100644 --- a/constants.properties +++ b/constants.properties @@ -20,7 +20,7 @@ quasarVersion11=0.8.1_r3 jdkClassifier11=jdk11 dockerJavaVersion=3.2.5 proguardVersion=6.1.1 -bouncycastleVersion=1.78.1 +bouncycastleVersion=1.68 classgraphVersion=4.8.135 disruptorVersion=3.4.2 typesafeConfigVersion=1.3.4 diff --git a/core-deterministic/build.gradle b/core-deterministic/build.gradle index d2b38682be..48dac3afd0 100644 --- a/core-deterministic/build.gradle +++ b/core-deterministic/build.gradle @@ -45,8 +45,8 @@ dependencies { // These dependencies will become "runtime" scoped in our published POM. // See publish.dependenciesFrom.defaultScope. - deterministicLibraries "org.bouncycastle:bcprov-jdk18on:$bouncycastle_version" - deterministicLibraries "org.bouncycastle:bcpkix-jdk18on:$bouncycastle_version" + deterministicLibraries "org.bouncycastle:bcprov-jdk15on:$bouncycastle_version" + deterministicLibraries "org.bouncycastle:bcpkix-jdk15on:$bouncycastle_version" deterministicLibraries "net.i2p.crypto:eddsa:$eddsa_version" } diff --git a/core/build.gradle b/core/build.gradle index 46f09f8462..4ed50e21a3 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -72,8 +72,8 @@ dependencies { compile "net.i2p.crypto:eddsa:$eddsa_version" // Bouncy castle support needed for X509 certificate manipulation - compile "org.bouncycastle:bcprov-jdk18on:${bouncycastle_version}" - compile "org.bouncycastle:bcpkix-jdk18on:${bouncycastle_version}" + compile "org.bouncycastle:bcprov-jdk15on:${bouncycastle_version}" + compile "org.bouncycastle:bcpkix-jdk15on:${bouncycastle_version}" // JPA 2.2 annotations. compile "javax.persistence:javax.persistence-api:2.2" From 423fbf6993eacc0e1185c69ebfc44a00008a579b Mon Sep 17 00:00:00 2001 From: Adel El-Beik <48713346+adelel1@users.noreply.github.com> Date: Tue, 1 Oct 2024 09:04:55 +0100 Subject: [PATCH 2/4] Update constants.properties --- constants.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constants.properties b/constants.properties index a30f2432ac..9ac7930791 100644 --- a/constants.properties +++ b/constants.properties @@ -20,7 +20,7 @@ quasarVersion11=0.8.1_r3 jdkClassifier11=jdk11 dockerJavaVersion=3.2.5 proguardVersion=6.1.1 -bouncycastleVersion=1.68 +bouncycastleVersion=1.78.1 classgraphVersion=4.8.135 disruptorVersion=3.4.2 typesafeConfigVersion=1.3.4 From 576e37c3bb27d4ea3799a31a2ad64984b6148c0c Mon Sep 17 00:00:00 2001 From: Adel El-Beik <48713346+adelel1@users.noreply.github.com> Date: Tue, 1 Oct 2024 09:06:15 +0100 Subject: [PATCH 3/4] Update build.gradle --- core-deterministic/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core-deterministic/build.gradle b/core-deterministic/build.gradle index 48dac3afd0..d2b38682be 100644 --- a/core-deterministic/build.gradle +++ b/core-deterministic/build.gradle @@ -45,8 +45,8 @@ dependencies { // These dependencies will become "runtime" scoped in our published POM. // See publish.dependenciesFrom.defaultScope. - deterministicLibraries "org.bouncycastle:bcprov-jdk15on:$bouncycastle_version" - deterministicLibraries "org.bouncycastle:bcpkix-jdk15on:$bouncycastle_version" + deterministicLibraries "org.bouncycastle:bcprov-jdk18on:$bouncycastle_version" + deterministicLibraries "org.bouncycastle:bcpkix-jdk18on:$bouncycastle_version" deterministicLibraries "net.i2p.crypto:eddsa:$eddsa_version" } From b9fb90edda6a97dfda246d25fb48dda34812100c Mon Sep 17 00:00:00 2001 From: Adel El-Beik <48713346+adelel1@users.noreply.github.com> Date: Tue, 1 Oct 2024 09:06:39 +0100 Subject: [PATCH 4/4] Update build.gradle --- core/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 4ed50e21a3..46f09f8462 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -72,8 +72,8 @@ dependencies { compile "net.i2p.crypto:eddsa:$eddsa_version" // Bouncy castle support needed for X509 certificate manipulation - compile "org.bouncycastle:bcprov-jdk15on:${bouncycastle_version}" - compile "org.bouncycastle:bcpkix-jdk15on:${bouncycastle_version}" + compile "org.bouncycastle:bcprov-jdk18on:${bouncycastle_version}" + compile "org.bouncycastle:bcpkix-jdk18on:${bouncycastle_version}" // JPA 2.2 annotations. compile "javax.persistence:javax.persistence-api:2.2"