Revision: 621cd0d0dbeb
Author:   vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Wed May 21 13:37:02 2014 UTC
Log: Trust store type is now independent from keystore type https://java.net/jira/browse/JSIP-462

git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2306 8e71dc83-d81e-6649-80f2-80b843a9b2be

http://code.google.com/p/jain-sip/source/detail?r=621cd0d0dbeb

Modified:
 /src/gov/nist/core/net/SslNetworkLayer.java
 /src/gov/nist/javax/sip/SipStackImpl.java

=======================================
--- /src/gov/nist/core/net/SslNetworkLayer.java Sun Dec 29 04:24:08 2013 UTC
+++ /src/gov/nist/core/net/SslNetworkLayer.java Wed May 21 13:37:02 2014 UTC
@@ -100,7 +100,7 @@
             String keyStoreFile,
             char[] keyStorePassword,
             char[] trustStorePassword,
- String keyStoreType) throws GeneralSecurityException, FileNotFoundException, IOException + String keyStoreType, String trustStoreType) throws GeneralSecurityException, FileNotFoundException, IOException
     {
         SSLContext sslContext;
         sslContext = SSLContext.getInstance("TLS");
@@ -112,7 +112,7 @@
         KeyStore keyStore = KeyStore.getInstance(
keyStoreType != null ? keyStoreType : KeyStore.getDefaultType());
         KeyStore trustStore = KeyStore.getInstance(
- keyStoreType != null ? keyStoreType : KeyStore.getDefaultType()); + trustStoreType != null ? trustStoreType : KeyStore.getDefaultType());
         keyStore.load(new FileInputStream(keyStoreFile), keyStorePassword);
trustStore.load(new FileInputStream(trustStoreFile), trustStorePassword);
         tmFactory.init(trustStore);
=======================================
--- /src/gov/nist/javax/sip/SipStackImpl.java   Sun Dec 29 04:24:08 2013 UTC
+++ /src/gov/nist/javax/sip/SipStackImpl.java   Wed May 21 13:37:02 2014 UTC
@@ -870,6 +870,14 @@
                                        
.getProperty("javax.net.ssl.keyStorePassword");
                        String trustStorePassword = configurationProperties
                                        
.getProperty("javax.net.ssl.trustStorePassword", keyStorePassword);
+
+                       String keyStoreType = configurationProperties
+                                       
.getProperty("javax.net.ssl.keyStoreType");
+                       String trustStoreType = configurationProperties
+                                       
.getProperty("javax.net.ssl.trustStoreType");
+
+                       if(trustStoreType == null) trustStoreType = 
keyStoreType;
+
                        try {
                                this.networkLayer = new SslNetworkLayer(this, 
trustStoreFile,
                                                keyStoreFile,
@@ -877,8 +885,7 @@
                                                    
keyStorePassword.toCharArray() : null,
                                                trustStorePassword != null ?
                                                                    
trustStorePassword.toCharArray() : null,
-                                               configurationProperties
-                                                               
.getProperty("javax.net.ssl.keyStoreType"));
+                                               keyStoreType, trustStoreType);
                        } catch (Exception e1) {
                                logger.logError(
                                                "could not instantiate SSL 
networking", e1);

--

--- You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to