More work

bindings/java/src/org/sleuthkit/datamodel/CaseDatabaseFactory.java

@@ -718,7 +718,8 @@ Connection getConnection(String databaseName) throws TskCoreException {
 				// NonValidatingFactory avoids hostname verification.
 				// sslmode=require: This mode makes the encryption mandatory and also requires the connection to fail if it cant be encrypted. 
                 // In this mode, the JDBC driver accepts all server certificates.
-				url.append("?ssl=true&sslfactory=org.postgresql.ssl.NonValidatingFactory&sslmode=require");
+				//url.append("?ssl=true&sslfactory=org.postgresql.ssl.NonValidatingFactory&sslmode=require");
+				url.append("?ssl=true&sslfactory=org.postgresql.ssl.DefaultJavaSSLFactory&sslmode=verify-ca");
 			}
 			
 			Connection conn;

bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java

@@ -299,7 +299,8 @@ public static void tryConnect(CaseDbConnectionInfo info) throws TskCoreException
 				// NonValidatingFactory avoids hostname verification.
 				// sslmode=require: This mode makes the encryption mandatory and also requires the connection to fail if it cant be encrypted. 
                 // In this mode, the JDBC driver accepts all server certificates.
-				connectionURL += "?ssl=true&sslfactory=org.postgresql.ssl.NonValidatingFactory&sslmode=require";
+				//connectionURL += "?ssl=true&sslfactory=org.postgresql.ssl.NonValidatingFactory&sslmode=require";
+				connectionURL += "?ssl=true&sslfactory=org.postgresql.ssl.DefaultJavaSSLFactory&sslmode=verify-ca";
 			}
 			Connection conn = DriverManager.getConnection(connectionURL, info.getUserName(), info.getPassword()); //NON-NLS
 			if (conn != null) {
@@ -13410,7 +13411,8 @@ private final class PostgreSQLConnections extends ConnectionPool {
 				// NonValidatingFactory avoids hostname verification.
 				// sslmode=require: This mode makes the encryption mandatory and also requires the connection to fail if it cant be encrypted. 
                 // In this mode, the JDBC driver accepts all server certificates.
-				connectionURL += "?ssl=true&sslfactory=org.postgresql.ssl.NonValidatingFactory&sslmode=require";
+				//connectionURL += "?ssl=true&sslfactory=org.postgresql.ssl.NonValidatingFactory&sslmode=require";
+				connectionURL += "?ssl=true&sslfactory=org.postgresql.ssl.DefaultJavaSSLFactory&sslmode=verify-ca";
 			}
 			comboPooledDataSource.setJdbcUrl(connectionURL);
 			comboPooledDataSource.setUser(info.getUserName());