From 4b3853ff1f4c7b8968bcea72c441dd834cc7a61d Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Wed, 5 Jul 2023 12:27:52 -0600 Subject: [PATCH] Upgrade BouncyCastle libraries (#5675) Upgrade bouncy castle to v1.75. This involved a change in maven coordinates for other modules. Signed-off-by: Danno Ferrin --- crypto/algorithms/build.gradle | 2 +- enclave/build.gradle | 4 ++-- ethereum/api/build.gradle | 8 ++++---- ethereum/evmtool/build.gradle | 6 +++--- ethereum/trie/build.gradle | 2 +- ethereum/verkletrie/build.gradle | 2 +- gradle/verification-metadata.xml | 24 ++++++++++++++++++++++++ gradle/versions.gradle | 6 +++--- pki/build.gradle | 4 ++-- 9 files changed, 41 insertions(+), 17 deletions(-) diff --git a/crypto/algorithms/build.gradle b/crypto/algorithms/build.gradle index 3421c990bf3..ad5346e2273 100644 --- a/crypto/algorithms/build.gradle +++ b/crypto/algorithms/build.gradle @@ -29,7 +29,7 @@ jar { } dependencies { - api 'org.bouncycastle:bcprov-jdk15on' + api 'org.bouncycastle:bcprov-jdk18on' api 'org.slf4j:slf4j-api' implementation 'net.java.dev.jna:jna' diff --git a/enclave/build.gradle b/enclave/build.gradle index 302b2f246a4..103d7f1ab1f 100644 --- a/enclave/build.gradle +++ b/enclave/build.gradle @@ -9,7 +9,7 @@ dependencies { implementation 'io.vertx:vertx-web' implementation 'org.apache.tuweni:tuweni-net' - runtimeOnly('org.bouncycastle:bcpkix-jdk15on') + runtimeOnly('org.bouncycastle:bcpkix-jdk18on') // test dependencies. testImplementation project(':testutil') @@ -20,7 +20,7 @@ dependencies { // integration test dependencies. integrationTestImplementation project(':testutil') integrationTestImplementation 'org.assertj:assertj-core' - integrationTestImplementation 'org.bouncycastle:bcpkix-jdk15on' + integrationTestImplementation 'org.bouncycastle:bcpkix-jdk18on' integrationTestImplementation 'org.awaitility:awaitility' integrationTestImplementation 'org.junit.jupiter:junit-jupiter-api' integrationTestImplementation 'org.mockito:mockito-core' diff --git a/ethereum/api/build.gradle b/ethereum/api/build.gradle index 68b53a3b76a..922dfd0ee6b 100644 --- a/ethereum/api/build.gradle +++ b/ethereum/api/build.gradle @@ -69,14 +69,14 @@ dependencies { implementation 'org.apache.tuweni:tuweni-toml' implementation 'org.apache.tuweni:tuweni-units' implementation 'org.antlr:antlr4-runtime' - implementation 'org.bouncycastle:bcprov-jdk15on' + implementation 'org.bouncycastle:bcprov-jdk18on' implementation 'org.springframework.security:spring-security-crypto' implementation 'org.xerial.snappy:snappy-java' annotationProcessor "org.immutables:value" implementation "org.immutables:value-annotations" - runtimeOnly 'org.bouncycastle:bcpkix-jdk15on' + runtimeOnly 'org.bouncycastle:bcpkix-jdk18on' runtimeOnly 'io.netty:netty-transport-native-epoll' runtimeOnly 'io.netty:netty-transport-native-kqueue' @@ -106,7 +106,7 @@ dependencies { testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' - testSupportImplementation 'org.bouncycastle:bcpkix-jdk15on' + testSupportImplementation 'org.bouncycastle:bcpkix-jdk18on' integrationTestImplementation project(':config') integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts') @@ -125,7 +125,7 @@ dependencies { artifacts { testSupportArtifacts testSupportJar } -task generateTestBlockchain() { +tasks.register('generateTestBlockchain') { def srcFiles = 'src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data' def dataPath = "$buildDir/generated/data" def blocksBin = "$buildDir/resources/test/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/blocks.bin" diff --git a/ethereum/evmtool/build.gradle b/ethereum/evmtool/build.gradle index fa3f989cdd8..df8b99aea53 100644 --- a/ethereum/evmtool/build.gradle +++ b/ethereum/evmtool/build.gradle @@ -102,7 +102,7 @@ tasks.register("dockerDistUntar") { } } -task distDocker(type: Exec) { +tasks.register('distDocker', Exec) { dependsOn dockerDistUntar def dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}" def dockerOrgName = project.hasProperty('dockerOrgName') ? project.getProperty("dockerOrgName") : "hyperledger" @@ -124,9 +124,9 @@ task distDocker(type: Exec) { args "-c", "docker build --build-arg BUILD_DATE=${buildTime()} --build-arg VERSION=${dockerBuildVersion} --build-arg VCS_REF=${getCheckedOutGitCommitHash()} -t ${image} ." } -task dockerUpload(type: Exec) { +tasks.register('dockerUpload', Exec) { dependsOn distDocker - def dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}" + String dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}" def dockerOrgName = project.hasProperty('dockerOrgName') ? project.getProperty("dockerOrgName") : "hyperledger" def dockerArtifactName = project.hasProperty("dockerArtifactName") ? project.getProperty("dockerArtifactName") : "besu-evmtool" def imageName = "${dockerOrgName}/${dockerArtifactName}" diff --git a/ethereum/trie/build.gradle b/ethereum/trie/build.gradle index c671a75bf0f..0477841563d 100644 --- a/ethereum/trie/build.gradle +++ b/ethereum/trie/build.gradle @@ -37,7 +37,7 @@ dependencies { implementation 'com.google.guava:guava' implementation 'io.opentelemetry:opentelemetry-api' implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.bouncycastle:bcprov-jdk15on' + implementation 'org.bouncycastle:bcprov-jdk18on' annotationProcessor 'org.immutables:value' diff --git a/ethereum/verkletrie/build.gradle b/ethereum/verkletrie/build.gradle index 0ca780ba88d..1d23538ed0c 100644 --- a/ethereum/verkletrie/build.gradle +++ b/ethereum/verkletrie/build.gradle @@ -37,7 +37,7 @@ dependencies { implementation 'io.opentelemetry:opentelemetry-api' implementation 'org.apache.tuweni:tuweni-bytes' implementation 'org.apache.tuweni:tuweni-units' - implementation 'org.bouncycastle:bcprov-jdk15on' + implementation 'org.bouncycastle:bcprov-jdk18on' implementation 'org.hyperledger.besu:ipa-multipoint' annotationProcessor "org.immutables:value" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 5d84c51d99d..a71f2bbff64 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -3545,6 +3545,14 @@ + + + + + + + + @@ -3569,6 +3577,14 @@ + + + + + + + + @@ -3585,6 +3601,14 @@ + + + + + + + + diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 88e87bdf01f..0c677809ad3 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -156,9 +156,9 @@ dependencyManagement { dependency 'org.awaitility:awaitility:4.2.0' - dependencySet(group: 'org.bouncycastle', version: '1.70') { - entry'bcpkix-jdk15on' - entry'bcprov-jdk15on' + dependencySet(group: 'org.bouncycastle', version: '1.75') { + entry'bcpkix-jdk18on' + entry'bcprov-jdk18on' } dependency 'org.fusesource.jansi:jansi:2.4.0' diff --git a/pki/build.gradle b/pki/build.gradle index a3edd47ce74..3eab6aca046 100644 --- a/pki/build.gradle +++ b/pki/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation 'com.google.guava:guava' implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.bouncycastle:bcpkix-jdk15on' + implementation 'org.bouncycastle:bcpkix-jdk18on' testImplementation 'junit:junit' testImplementation 'org.assertj:assertj-core' @@ -43,7 +43,7 @@ dependencies { } configurations { testArtifacts } -task testJar(type: Jar) { +tasks.register('testJar', Jar) { archiveBaseName = "${project.name}-test" from sourceSets.test.output }