diff --git a/cloud-sql/sqlserver/client-side-encryption/pom.xml b/cloud-sql/sqlserver/client-side-encryption/pom.xml index 94d69542ee4..ce5c9f05f41 100644 --- a/cloud-sql/sqlserver/client-side-encryption/pom.xml +++ b/cloud-sql/sqlserver/client-side-encryption/pom.xml @@ -67,7 +67,7 @@ com.microsoft.sqlserver mssql-jdbc - 9.4.1.jre8 + 10.2.0.jre8 com.google.crypto.tink diff --git a/cloud-sql/sqlserver/client-side-encryption/src/main/java/cloudsql/tink/CloudSqlConnectionPool.java b/cloud-sql/sqlserver/client-side-encryption/src/main/java/cloudsql/tink/CloudSqlConnectionPool.java index 23eaa7c6866..a0a9438f943 100644 --- a/cloud-sql/sqlserver/client-side-encryption/src/main/java/cloudsql/tink/CloudSqlConnectionPool.java +++ b/cloud-sql/sqlserver/client-side-encryption/src/main/java/cloudsql/tink/CloudSqlConnectionPool.java @@ -35,6 +35,10 @@ public static DataSource createConnectionPool(String dbUser, String dbPass, Stri config.setPassword(dbPass); // e.g. "my-password" config.addDataSourceProperty("databaseName", dbName); + // The Cloud SQL Java Connector provides SSL encryption so + // it should be disabled at the driver level + config.addDataSourceProperty("encrypt", "false"); + config.addDataSourceProperty("socketFactoryClass", "com.google.cloud.sql.sqlserver.SocketFactory"); config.addDataSourceProperty("socketFactoryConstructorArg", instanceConnectionName); @@ -60,4 +64,4 @@ public static void createTable(DataSource pool, String tableName) throws SQLExce } } } -// [END cloud_sql_sqlserver_cse_db] \ No newline at end of file +// [END cloud_sql_sqlserver_cse_db]