XAPI: Remove ssl-ca-path and slsl-key options.

Author: rsomla1

include/mysql_xapi.h

@@ -336,7 +336,6 @@ typedef enum mysqlx_opt_type_enum
   MYSQLX_OPT_DB = 5,
   MYSQLX_OPT_SSL_ENABLE = 6,
   MYSQLX_OPT_SSL_CA = 7,
-  MYSQLX_OPT_SSL_CA_PATH = 8
 }
 mysqlx_opt_type_t;
 

xapi/mysqlx.cc

@@ -1725,10 +1725,6 @@ mysqlx_session_option_set(mysqlx_session_options_t *opt, mysqlx_opt_type_t type,
       char_data = va_arg(args, char*);
       opt->set_ssl_ca(char_data);
     break;
-    case MYSQLX_OPT_SSL_CA_PATH:
-      char_data = va_arg(args, char*);
-      opt->set_ssl_ca_path(char_data);
-    break;
 #else
     case MYSQLX_OPT_SSL_ENABLE:
     case MYSQLX_OPT_SSL_CA:
@@ -1799,10 +1795,6 @@ mysqlx_session_option_get(mysqlx_session_options_t *opt, mysqlx_opt_type_t type,
       CHECK_OUTPUT_BUF(char_data, char*)
       strcpy(char_data, opt->get_tls().get_ca().data());
     break;
-    case MYSQLX_OPT_SSL_CA_PATH:
-      CHECK_OUTPUT_BUF(char_data, char*)
-      strcpy(char_data, opt->get_tls().get_ca_path().data());
-    break;
 #else
     case MYSQLX_OPT_SSL_ENABLE:
     case MYSQLX_OPT_SSL_CA:

xapi/mysqlx_cc_internal.h

@@ -502,14 +502,6 @@ typedef struct mysqlx_session_options_struct : public Mysqlx_diag,
       {
         set_ssl_ca(val);
       }
-      else if (key.compare("ssl-ca-path") == 0)
-      {
-        set_ssl_ca_path(val);
-      }
-      else if (key.compare("ssl-key") == 0)
-      {
-        set_ssl_key(val);
-      }
 #else
       set_diagnostic(
         "Can not create TLS session - this connector is built"

xapi/tests/xapi-t.cc

@@ -525,10 +525,6 @@ TEST_F(xapi, conn_options_test)
         EXPECT_EQ(RESULT_OK, mysqlx_session_option_get(opt, MYSQLX_OPT_SSL_CA, buf_check));
         EXPECT_STREQ(ca_buf, buf_check);
       }
-
-      EXPECT_EQ(RESULT_OK, mysqlx_session_option_set(opt, MYSQLX_OPT_SSL_CA_PATH, capath_buf));
-      EXPECT_EQ(RESULT_OK, mysqlx_session_option_get(opt, MYSQLX_OPT_SSL_CA_PATH, buf_check));
-      EXPECT_STREQ(capath_buf, buf_check);
     }
 
     goto DO_CONNECT;