8000 Upgrade BouncyCastle FIPS by stianst · Pull Request #53182 · keycloak/keycloak · GitHub
[go: up one dir, main page]

Skip to content

Upgrade BouncyCastle FIPS - #53182

Merged
stianst merged 1 commit into
keycloak:mainfrom
stianst:pr-53090
Sep 25, 2026
Merged

stianst merged 1 commit into
keycloak:mainfrom
stianst:pr-53090

Conversation

@stianst
@stianst stianst commented Sep 25, 2026
Copy link
Copy Markdown
Contributor

Closes #52974

Closes #52972

Signed-off-by: stianst stianst@gmail.com

Copilot AI balanced review requested due to automatic review settings September 25, 2026 08:47
8000
@stianst
stianst requested review from a team as code owners September 25, 2026 08:47
Closes keycloak#52974

Closes keycloak#52972

Signed-off-by: stianst <stianst@gmail.com>
Copilot AI left a comment
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot review overview

🟡 Changes recommended

The troubleshooting guide associates SAN remediation with an error that instead indicates a missing client-supplied hostname.

Get a fresh assessment by requesting another Copilot review.

Review effort: Balanced
Findings: 1 Low severity

Open (1)
What changed in this PR

Upgrades Bouncy Castle FIPS dependencies to patched versions addressing the referenced CVEs.

Changes:

  • Updates the coordinated Bouncy Castle FIPS dependency set.
  • Refreshes provider-version assertions and documentation.
  • Regenerates test certificates and truststores with SAN support.
File Description
pom.xml Updates FIPS dependency versions.
docs/​guides/​server/​fips.adoc Updates version output and troubleshooting guidance.
quarkus/​tests/​integration/​src/​test/​java/​org/​keycloak/​it/​cli/​dist/​FipsDistTest.java Updates expected provider version.
tests/​base/​src/​test/​resources/​keycloak-truststore.bcfks Refreshes test truststore.
tests/​base/​src/​test/​resources/​keycloak-truststore.pem Adds the SAN-enabled localhost certificate.
tests/​base/​src/​test/​resources/​keycloak.bcfks Refreshes the server test keystore.
tests/​base/​src/​test/​resources/​org/​keycloak/​tests/​cli/​keycloak.truststore Refreshes the CLI test truststore.
testsuite/​integration-arquillian/​servers/​app-server/​jboss/​common/​keystore/​keycloak.truststore Refreshes the application-server truststore.
testsuite/​integration-arquillian/​servers/​auth-server/​common/​fips/​keycloak-fips.keystore.bcfks Refreshes the FIPS BCFKS keystore.
testsuite/​integration-arquillian/​servers/​auth-server/​common/​fips/​keycloak-fips.keystore.pkcs12 Refreshes the FIPS PKCS12 keystore.
testsuite/​integration-arquillian/​servers/​auth-server/​common/​fips/​keycloak-fips.truststore.bcfks Refreshes the FIPS BCFKS truststore.
testsuite/​integration-arquillian/​servers/​auth-server/​common/​fips/​keycloak-fips.truststore.pkcs12 Refreshes the FIPS PKCS12 truststore.
testsuite/​integration-arquillian/​servers/​auth-server/​common/​keystore/​keycloak.jks Refreshes the authentication-server keystore.
testsuite/​integration-arquillian/​servers/​auth-server/​common/​keystore/​keycloak.truststore Refreshes the authentication-server truststore.
testsuite/​integration-arquillian/​tests/​base/​src/​test/​resources/​keystore/​keycloak.jks Refreshes the integration-test keystore.
testsuite/​integration-arquillian/​tests/​base/​src/​test/​resources/​keystore/​keycloak.truststore Refreshes the integration-test truststore.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment on lines +305 to +306
If you see an error such as `No hostname specified for HTTPS endpoint ID check` the recommended solution is to
update the certificates to include a Subject Alternative Name (SAN).
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the exact error we observed in testing, we've not seen the one suggested by Copilot

Copilot AI review requested due to automatic review settings September 25, 2026 08:52
Copilot AI left a comment
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot review overview

🟡 Changes recommended

The troubleshooting guidance inaccurately applies hostname SAN requirements to all TLS certificates and cites an error unrelated to missing SANs.

Get a fresh assessment by requesting another Copilot review.

Review effort: Balanced
Findings: 2 Low severity

Open (2)

Comment on lines +301 to +303
BouncyCastle FIPS requires TLS certificates with a Subject Alternative Name (SAN), with no fallback to using
the Common Name (CN) from the certificate. Due to an issue in older versions of BouncyCastle FIPS the fallback was
enabled by default, which is no longer the case.
@rmartinc rmartinc left a comment
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @stianst!

@stianst
stianst merged commit 1bf99e3 into keycloak:main Sep 25, 2026
97 checks passed
@stianst stianst mentioned this pull request Sep 25, 2026
stianst added a commit that referenced this pull request Sep 25, 2026
Closes #52974

Closes #52972


(cherry picked from commit 1bf99e3)

Signed-off-by: stianst <stianst@gmail.com>
stianst added a commit that referenced this pull request Sep 25, 2026
Closes #52974

Closes #52972


(cherry picked from commit 1bf99e3)

Signed-off-by: stianst <stianst@gmail.com>
@stianst
stianst deleted the pr-53090 branch October 1, 2026 10:01
tsaarni pushed a commit to Nordix/keycloak that referenced this pull request Oct 14, 2026
Closes keycloak#52974

Closes keycloak#52972


(cherry picked from commit 1bf99e3)

Signed-off-by: stianst <stianst@gmail.com>
stianst added a commit that referenced this pull request Nov 6, 2026
Closes #52974

Closes #52972

(cherry picked from commit 1bf99e3)

Signed-off-by: stianst <stianst@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

CVE-2026-13505 org.bouncycastle:bc-fips CVE-2026-8798 org.bouncycastle:bc-fips

3 participants

0