OF-946: Preventing a NPE. Also: Keystore config must have password.

src/java/org/jivesoftware/openfire/keystore/Purpose.java

@@ -226,7 +226,7 @@ public enum Purpose
     public String getCipherSuitesDisabled()
     {
         final String propertyName = prefix + "ciphersuites.disabled";
-        final String defaultValue = null;
+        final String defaultValue = "";
 
         if ( fallback == null )
         {

src/java/org/jivesoftware/openfire/net/SSLConfig.java

@@ -532,8 +532,13 @@ public class SSLConfig
     {
         final SslContextFactory sslContextFactory = new SslContextFactory();
 
-        sslContextFactory.setTrustStore( SSLConfig.getTrustStore( purpose ) );
-        sslContextFactory.setKeyStore( SSLConfig.getIdentityStore( purpose ) );
+        final TrustStoreConfig trustStoreConfig = SSLConfig.getInstance().getTrustStoreConfig( purpose );
+        sslContextFactory.setTrustStore( trustStoreConfig.getStore() );
+        sslContextFactory.setTrustStorePassword( trustStoreConfig.getPassword() );
+
+        final IdentityStoreConfig identityStoreConfig = SSLConfig.getInstance().getIdentityStoreConfig( purpose );
+        sslContextFactory.setKeyStore( identityStoreConfig.getStore() );
+        sslContextFactory.setKeyStorePassword( identityStoreConfig.getPassword() );
 
         // Configure protocol and cipher suite support.
         if ( purpose.getProtocolsEnabled() != null ) {