pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21

diff -ur openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
--- openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2014-07-17 12:12:14.000000000 +0200
+++ openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2014-12-09 13:31:27.821960372 +0100
@@ -161,6 +161,7 @@
         /*
          * Try:
          *      javax.net.ssl.trustStore  (if this variable exists, stop)
+         *      system environment variable JAVAX_NET_SSL_TRUSTSTORE
          *      jssecacerts
          *      cacerts
          *
@@ -169,6 +169,9 @@
 
         try {
             storeFileName = props.get("trustStore");
+            if (storeFileName == null) {
+                storeFileName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE");
+            }
             if (!"NONE".equals(storeFileName)) {
                 if (storeFileName != null) {
                     storeFile = new File(storeFileName);