Skip to content

Commit

Permalink
21368 updated bouncycastle to jdk15to18 1.75
Browse files Browse the repository at this point in the history
  • Loading branch information
@sschu
sschu committed Jun 30, 2023
1 parent 83d043e commit 77aa82c
Show file tree
Hide file tree
Showing 32 changed files with 42 additions and 43 deletions.
2 changes: 1 addition & 1 deletion adapters/oidc/adapter-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/installed/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/jakarta-servlet-filter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/jetty/jetty-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/jetty/jetty9.4/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/servlet-filter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/spring-security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/tomcat/tomcat-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/tomcat/tomcat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/undertow/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/wildfly-elytron/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/saml/jakarta-servlet-filter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/saml/jetty/jetty-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/saml/jetty/jetty9.4/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/saml/servlet-filter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/saml/tomcat/tomcat-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/saml/tomcat/tomcat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/spi/adapter-spi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion adapters/spi/jboss-adapter-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
4 changes: 2 additions & 2 deletions crypto/default/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<artifactId>bcpkix-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
Expand Down
4 changes: 2 additions & 2 deletions dependencies/server-min/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<artifactId>bcpkix-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...lient-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/util/ClassLoaderUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static ClassLoader resolveClassLoader(String libDir) {

// Detect if BC FIPS jars are present in the "client/lib" directory
boolean bcFipsJarPresent = Stream.of(jarsInDir).anyMatch(file -> file.getName().startsWith("bc-fips"));
String[] validJarPrefixes = bcFipsJarPresent ? new String[] {"keycloak-crypto-fips1402", "bc-fips", "bctls-fips"} : new String[] {"keycloak-crypto-default", "bcprov-jdk15on"};
String[] validJarPrefixes = bcFipsJarPresent ? new String[] {"keycloak-crypto-fips1402", "bc-fips", "bctls-fips"} : new String[] {"keycloak-crypto-default", "bcprov-jdk15to18"};
URL[] usedJars = Stream.of(jarsInDir)
.filter(file -> {
for (String prefix : validJarPrefixes) {
Expand Down
2 changes: 1 addition & 1 deletion integration/client-cli/client-cli-dist/assembly.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<includes>
<include>org.keycloak:keycloak-crypto-default</include>
<include>org.keycloak:keycloak-crypto-fips1402</include>
<include>org.bouncycastle:bcprov-jdk15on</include>
<include>org.bouncycastle:bcprov-jdk15to18</include>
</includes>
<outputDirectory>keycloak-client-tools/bin/client/lib</outputDirectory>
</dependencySet>
Expand Down
2 changes: 1 addition & 1 deletion integration/client-cli/client-cli-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...stration-cli/src/main/java/org/keycloak/client/registration/cli/util/ClassLoaderUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static ClassLoader resolveClassLoader(String libDir) {

// Detect if BC FIPS jars are present in the "client/lib" directory
boolean bcFipsJarPresent = Stream.of(jarsInDir).anyMatch(file -> file.getName().startsWith("bc-fips"));
String[] validJarPrefixes = bcFipsJarPresent ? new String[] {"keycloak-crypto-fips1402", "bc-fips", "bctls-fips"} : new String[] {"keycloak-crypto-default", "bcprov-jdk15on"};
String[] validJarPrefixes = bcFipsJarPresent ? new String[] {"keycloak-crypto-fips1402", "bc-fips", "bctls-fips"} : new String[] {"keycloak-crypto-default", "bcprov-jdk15to18"};
URL[] usedJars = Stream.of(jarsInDir)
.filter(file -> {
for (String prefix : validJarPrefixes) {
Expand Down
4 changes: 2 additions & 2 deletions operator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@
<!-- FIXME: Adding BC for now as removing the Bouncycastle dependencies from the operator makes it unusable on K3s and possibly on other kubernetes distributions (e.g. Rancher is based on K3s). -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<artifactId>bcpkix-jdk15to18</artifactId>
</dependency>

<!-- Test -->
Expand Down
11 changes: 5 additions & 6 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@
<apache.httpcomponents.version>4.5.14</apache.httpcomponents.version>
<apache.httpcomponents.httpcore.version>4.4.16</apache.httpcomponents.httpcore.version>
<jboss.dmr.version>1.5.1.Final</jboss.dmr.version>
<bouncycastle.version>1.73</bouncycastle.version>
<bouncycastle-bcprov-jdk15on.version>1.70</bouncycastle-bcprov-jdk15on.version>
<bouncycastle-bcprov-jdk15to18.version>1.75</bouncycastle-bcprov-jdk15to18.version>

<!-- TODO Are these correct versions? -->
<bouncycastle.fips.version>1.0.2.3</bouncycastle.fips.version>
Expand Down Expand Up @@ -376,13 +375,13 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${bouncycastle-bcprov-jdk15on.version}</version>
<artifactId>bcprov-jdk15to18</artifactId>
<version>${bouncycastle-bcprov-jdk15to18.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>${bouncycastle-bcprov-jdk15on.version}</version>
<artifactId>bcpkix-jdk15to18</artifactId>
<version>${bouncycastle-bcprov-jdk15to18.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/keycloak/quarkus/runtime/configuration/mappers/ClassLoaderPropertyMappers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ private static Optional<String> resolveIgnoredArtifacts(Optional<String> value,

if (profile.getFeatures().get(Feature.FIPS)) {
return Optional.of(
"org.bouncycastle:bcprov-jdk15on,org.bouncycastle:bcpkix-jdk15on,org.bouncycastle:bcutil-jdk15on,org.keycloak:keycloak-crypto-default");
"org.bouncycastle:bcprov-jdk15to18,org.bouncycastle:bcpkix-jdk15to18,org.bouncycastle:bcutil-jdk15to18,org.keycloak:keycloak-crypto-default");
}

return Optional.of(
Expand Down
4 changes: 2 additions & 2 deletions quarkus/tests/junit5/src/main/java/org/keycloak/Keycloak.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ private WorkspaceModule createWorkspaceModule(String keycloakVersion) {
.addExclusion("org.jboss.logmanager", "log4j-jboss-logmanager");

if (fipsEnabled) {
serverDependency.addExclusion("org.bouncycastle", "bcprov-jdk15on");
serverDependency.addExclusion("org.bouncycastle", "bcpkix-jdk15on");
serverDependency.addExclusion("org.bouncycastle", "bcprov-jdk15to18");
serverDependency.addExclusion("org.bouncycastle", "bcpkix-jdk15to18");
serverDependency.addExclusion("org.keycloak", "keycloak-crypto-default");
} else {
serverDependency.addExclusion("org.keycloak", "keycloak-crypto-fips1402");
Expand Down
2 changes: 1 addition & 1 deletion testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
4 changes: 2 additions & 2 deletions testsuite/integration-arquillian/tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1810,11 +1810,11 @@

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<artifactId>bcpkix-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
Expand Down
4 changes: 2 additions & 2 deletions testsuite/utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<artifactId>bcpkix-jdk15to18</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
Expand Down

0 comments on commit 77aa82c

Please sign in to comment.