JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #41776 from pclewis/openjdk-jdk10-truststore-from-env

Browse Source 
openjdk: fix truststore-from-env patch for jdk10
This commit is contained in:
Tim Steinbach 2018-06-11 09:35:12 -04:00 committed by GitHub
commit e0d1c6315a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
View File

@ -8,12 +8,22 @@
* jssecacerts * jssecacerts
* cacerts * cacerts
*/ */
@@ -144,6 +145,9 @@ @@ -132,7 +133,8 @@
public TrustStoreDescriptor run() {
// Get the system properties for trust store.
String storePropName = System.getProperty(
- "javax.net.ssl.trustStore", jsseDefaultStore);
+ "javax.net.ssl.trustStore",
+ System.getenv("JAVAX_NET_SSL_TRUSTSTORE"));
String storePropType = System.getProperty(
"javax.net.ssl.trustStoreType",
KeyStore.getDefaultType());
@@ -144,6 +146,9 @@
String temporaryName = ""; String temporaryName = "";
File temporaryFile = null; File temporaryFile = null;
long temporaryTime = 0L; long temporaryTime = 0L;
+ if (storePropName == null) { + if (storePropName == null) {
+ storePropName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE"); + storePropName = jsseDefaultStore;
+ } + }
if (!"NONE".equals(storePropName)) { if (!"NONE".equals(storePropName)) {
String[] fileNames = String[] fileNames =