at master 1.4 kB view raw
1--- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400 2+++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-07-05 20:45:57.491295030 -0400 3@@ -71,6 +71,7 @@ 4 * 5 * The preference of the default trusted KeyStore is: 6 * javax.net.ssl.trustStore 7+ * system environment variable JAVAX_NET_SSL_TRUSTSTORE 8 * jssecacerts 9 * cacerts 10 */ 11@@ -125,7 +126,8 @@ 12 static TrustStoreDescriptor run() { 13 // Get the system properties for trust store. 14 String storePropName = System.getProperty( 15- "javax.net.ssl.trustStore", jsseDefaultStore); 16+ "javax.net.ssl.trustStore", 17+ System.getenv("JAVAX_NET_SSL_TRUSTSTORE")); 18 String storePropType = System.getProperty( 19 "javax.net.ssl.trustStoreType", 20 KeyStore.getDefaultType()); 21@@ -137,6 +139,9 @@ 22 String temporaryName = ""; 23 File temporaryFile = null; 24 long temporaryTime = 0L; 25+ if (storePropName == null) { 26+ storePropName = jsseDefaultStore; 27+ } 28 if (!"NONE".equals(storePropName)) { 29 String[] fileNames = 30 new String[] {storePropName, defaultStore};