[Jython-checkins] jython: Respect javax.net.ssl.trustStorePassword for loading a trust store

[darjus.loktevic]

https://hg.python.org/jython/rev/0d8fa49ad7a7
changeset:   7914:0d8fa49ad7a7
user:        Darjus Loktevic <darjus at gmail.com>
date:        Mon Feb 29 15:53:49 2016 +1100
summary:
  Respect javax.net.ssl.trustStorePassword for loading a trust store

files:
  Lib/_sslcerts.py |  8 +++++---
  1 files changed, 5 insertions(+), 3 deletions(-)


diff --git a/Lib/_sslcerts.py b/Lib/_sslcerts.py
--- a/Lib/_sslcerts.py
+++ b/Lib/_sslcerts.py
@@ -4,7 +4,7 @@
 from StringIO import StringIO
 import types
 
-from java.lang import RuntimeException
+from java.lang import RuntimeException, System
 from java.io import BufferedInputStream, BufferedReader, FileReader, InputStreamReader, ByteArrayInputStream, IOException
 from java.security import KeyStore, Security, InvalidAlgorithmParameterException
 from java.security.cert import CertificateException, CertificateFactory
@@ -173,8 +173,10 @@
 
 def _extract_certs_from_keystore_file(f, password):
     keystore = KeyStore.getInstance(KeyStore.getDefaultType())
-    if password is None:  # default java keystore password is changeit
-        password = 'changeit'
+    if password is None:
+        password = System.getProperty('javax.net.ssl.trustStorePassword')
+        if password is None:  # default java keystore password is changeit
+            password = 'changeit'
     elif not isinstance(password, str):
         password = []
 

-- 
Repository URL: https://hg.python.org/jython