wl#7972: Added connection option "rsaKey" to specify RSA public key path name.

Hemant Dangi · Hemant Dangi · commit c9c33b62d69d · 2014-07-10T15:02:13.000+05:30
diff --git a/CHANGES b/CHANGES
@@ -37,6 +37,8 @@ GA  1.1.4 -
   fields. (Bug#18803414/72700)
 - Missing collation info in the column metadata methods for a result.
   (Bug#18803345/72698)
+- Added connection option "rsaKey" to specify RSA public key path name 
+  (wl#7972).
 
 - Built against libmysql 5.6.
 
diff --git a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp
@@ -247,7 +247,8 @@ static const String2IntMap stringOptions[]=
 	{
 		{"preInit",		MYSQL_INIT_COMMAND},
 		{"sslCRL",		MYSQL_OPT_SSL_CRL},
-		{"sslCRLPath",	MYSQL_OPT_SSL_CRLPATH}
+		{"sslCRLPath",	MYSQL_OPT_SSL_CRLPATH},
+		{"rsaKey",		MYSQL_SERVER_PUBLIC_KEY}
 	};
 
 template<class T>
diff --git a/test/unit/classes/connection.cpp b/test/unit/classes/connection.cpp
@@ -899,6 +899,19 @@ void connection::connectUsingMapWrongTypes()
     }
     connection_properties.erase("sslCRLPath");
 
+    try
+    {
+      connection_properties["rsaKey"]=(boolval);
+      created_objects.clear();
+      con.reset(driver->connect(connection_properties));
+      FAIL("No exception XXXIII - rsaKey");
+    }
+    catch (sql::InvalidArgumentException)
+    {
+      /* expected */
+    }
+    connection_properties.erase("rsaKey");
+
   }
   catch (sql::SQLException &e)
   {

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,8 @@ static const String2IntMap stringOptions[]=`
`247`	`247`	`{`
`248`	`248`	`{"preInit", MYSQL_INIT_COMMAND},`
`249`	`249`	`{"sslCRL", MYSQL_OPT_SSL_CRL},`
`250`		`- {"sslCRLPath", MYSQL_OPT_SSL_CRLPATH}`
	`250`	`+ {"sslCRLPath", MYSQL_OPT_SSL_CRLPATH},`
	`251`	`+ {"rsaKey", MYSQL_SERVER_PUBLIC_KEY}`
`251`	`252`	`};`
`252`	`253`
`253`	`254`	`template<class T>`
Original file line number	Diff line number	Diff line change
`@@ -899,6 +899,19 @@ void connection::connectUsingMapWrongTypes()`
`899`	`899`	`}`
`900`	`900`	`connection_properties.erase("sslCRLPath");`
`901`	`901`
	`902`	`+ try`
	`903`	`+ {`
	`904`	`+ connection_properties["rsaKey"]=(boolval);`
	`905`	`+ created_objects.clear();`
	`906`	`+ con.reset(driver->connect(connection_properties));`
	`907`	`+ FAIL("No exception XXXIII - rsaKey");`
	`908`	`+ }`
	`909`	`+ catch (sql::InvalidArgumentException)`
	`910`	`+ {`
	`911`	`+ /* expected */`
	`912`	`+ }`
	`913`	`+ connection_properties.erase("rsaKey");`
	`914`	`+`
`902`	`915`	`}`
`903`	`916`	`catch (sql::SQLException &e)`
`904`	`917`	`{`