Skip to content

Fix repository-gcs KeyStore.getInstance type/provider order in createFipsCompliantGoogleTrustStore #22288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gszkopinski wants to merge 3 commits into
base: main
Choose a base branch
from
+2 −1
Open

Fix repository-gcs KeyStore.getInstance type/provider order in createFipsCompliantGoogleTrustStore #22288

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b85907
Fix repository-gcs KeyStore.getInstance type/provider order
gszkopinski Jun 23, 2026
9dc7f65
Merge branch 'main' into fix-repository-gcs-bcfips-keystore-type
gszkopinski Jun 23, 2026
f75385d
Merge branch 'main' into fix-repository-gcs-bcfips-keystore-type
gszkopinski Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...pository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ static Integer toTimeout(final TimeValue timeout) {

private KeyStore createFipsCompliantGoogleTrustStore() throws GeneralSecurityException, IOException {
// Use BCFKS KeyStore type which is required for FIPS mode
KeyStore trustStore = KeyStore.getInstance("BCFIPS", "BCFIPS");
KeyStore trustStore = KeyStore.getInstance("BCFKS", "BCFIPS");
// Initialize empty BCFKS trust store
trustStore.load(null, null);

Expand All @@ -323,3 +323,4 @@ private KeyStore createFipsCompliantGoogleTrustStore() throws GeneralSecurityExc
return trustStore;
}
}

Loading