Skip to content

Use Windows system certificate store if requested by system properties #911

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use Windows system certificate store if requested by system properties #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions client/src/main/java/org/glassfish/tyrus/client/SslContextConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,17 @@ public SSLContext createSSLContext() {
TrustManagerFactory trustManagerFactory = null;
KeyManagerFactory keyManagerFactory = null;

if ("SunMSCAPI".equals(System.getProperty(TRUST_STORE_PROVIDER))) {
Copy link
Contributor

@jansupol jansupol Oct 2, 2024

Choose a reason for hiding this comment

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

@lwahonen Can instead of this code block be just updated the row below:

if (trustStoreBytes != null || trustStoreFile != null) {

with if (trustStoreBytes != null || trustStoreFile != null || "SunMSCAPI".equals(trustStoreType)) { ?

try {
KeyStore keyStore = KeyStore.getInstance(System.getProperty(TRUST_STORE_TYPE), "SunMSCAPI");
keyStore.load(null, null);
trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
trustManagerFactory.init(keyStore);
} catch (Throwable e) {
throw new RuntimeException(e);
}
}

if (keyStoreBytes != null || keyStoreFile != null) {
try {
KeyStore keyStore;
Expand Down
11 changes: 11 additions & 0 deletions ...client/src/main/java/org/glassfish/tyrus/container/jdk/client/SslContextConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,17 @@ public SSLContext createSSLContext() {

try {
TrustManagerFactory trustManagerFactory = null;
if ("SunMSCAPI".equals(System.getProperty(TRUST_STORE_PROVIDER))) {
try {
KeyStore keyStore = KeyStore.getInstance(System.getProperty(TRUST_STORE_TYPE), "SunMSCAPI");
keyStore.load(null, null);
trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
trustManagerFactory.init(keyStore);
} catch (Throwable e) {
throw new RuntimeException(e);
}
}

KeyManagerFactory keyManagerFactory = null;

if (keyStoreBytes != null || keyStoreFile != null) {
Expand Down