Connector/C++ doesn't implement MYSQL_OPT_SSL_VERIFY_SERVER_CERT,

lawrin · lawrin · commit 7bd2dceb2c99 · 2014-04-14T00:27:27.000+03:00
MYSQL_OPT_SSL_CRL, MYSQL_OPT_SSL_CRLPATH. Introduced connection options
"sslVerify"(boolean), "sslCRL" and "sslCRLPath"(string). (Bug#18461451)
diff --git a/CHANGES b/CHANGES
@@ -22,11 +22,15 @@
   51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-GA  1.1.4 - 2013-07-02
+GA  1.1.4 - 
 - Both static and dynamic driver libraries are now linked statically against
   libmysql library
 - Cannot Connect error when using legacy authentication. (Bug#16970753/69492)
-- Built against libmysql 5.6.11
+- Connector/C++ doesn't implement MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
+  MYSQL_OPT_SSL_CRL, MYSQL_OPT_SSL_CRLPATH. Introduced connection options
+  "sslVerify"(boolean), "sslCRL" and "sslCRLPath"(string). (Bug#18461451)
+
+- Built against libmysql 5.6.
 
 GA  1.1.3 - 2013-03-22
 - Added boolean connection option OPT_ENABLE_CLEARTEXT_PLUGIN allowing to
diff --git a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp
@@ -231,7 +231,8 @@ static bool read_connection_flag(ConnectOptionsMap::const_iterator &cit, int &fl
 static const String2IntMap booleanOptions[]= 
 	{
 		{"OPT_REPORT_DATA_TRUNCATION",	MYSQL_REPORT_DATA_TRUNCATION},
-		{"OPT_ENABLE_CLEARTEXT_PLUGIN",	MYSQL_ENABLE_CLEARTEXT_PLUGIN}
+		{"OPT_ENABLE_CLEARTEXT_PLUGIN",	MYSQL_ENABLE_CLEARTEXT_PLUGIN},
+		{"sslVerify",					MYSQL_OPT_SSL_VERIFY_SERVER_CERT}
 	};
 /* Array for mapping of integer connection options to mysql_options call */
 static const String2IntMap intOptions[]= 
@@ -243,7 +244,9 @@ static const String2IntMap intOptions[]=
 /* Array for mapping of string connection options to mysql_options call */
 static const String2IntMap stringOptions[]= 
 	{
-		{"preInit",	MYSQL_INIT_COMMAND}
+		{"preInit",		MYSQL_INIT_COMMAND},
+		{"sslCRL",		MYSQL_OPT_SSL_CRL},
+		{"sslCRLPath",	MYSQL_OPT_SSL_CRLPATH}
 	};
 
 template<class T>
@@ -343,7 +346,7 @@ void MySQL_Connection::init(ConnectOptionsMap & properties)
 	bool opt_reconnect = false;
 	bool opt_reconnect_value = false;
 	bool client_doesnt_support_exp_pwd = false;
-  bool secure_auth= true;
+	bool secure_auth= true;
 
 
 	/* Values set in properties individually should have priority over those
diff --git a/test/unit/classes/connection.cpp b/test/unit/classes/connection.cpp
@@ -860,6 +860,45 @@ void connection::connectUsingMapWrongTypes()
     }
     connection_properties.erase("OPT_REPORT_DATA_TRUNCATION");
 
+    try
+    {
+      connection_properties["sslVerify"]=(strval);
+      created_objects.clear();
+      con.reset(driver->connect(connection_properties));
+      FAIL("No exception XXXI - sslVerify");
+    }
+    catch (sql::InvalidArgumentException)
+    {
+      /* expected */
+    }
+    connection_properties.erase("sslVerify");
+
+    try
+    {
+      connection_properties["sslCRL"]=(boolval);
+      created_objects.clear();
+      con.reset(driver->connect(connection_properties));
+      FAIL("No exception XXXII - sslCRL");
+    }
+    catch (sql::InvalidArgumentException)
+    {
+      /* expected */
+    }
+    connection_properties.erase("sslCRL");
+
+    try
+    {
+      connection_properties["sslCRLPath"]=(boolval);
+      created_objects.clear();
+      con.reset(driver->connect(connection_properties));
+      FAIL("No exception XXXIII - sslCRLPath");
+    }
+    catch (sql::InvalidArgumentException)
+    {
+      /* expected */
+    }
+    connection_properties.erase("sslCRLPath");
+
   }
   catch (sql::SQLException &e)
   {
