From be57f6065c4896022213068118e9ad2b6213f935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Sun, 16 Dec 2018 12:51:05 +0100 Subject: [PATCH] Change references to ssl-enable to ssl-mode ssl-enable is not a valid option --- devapi/tests/session-t.cc | 4 ++-- include/mysqlx/xapi.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devapi/tests/session-t.cc b/devapi/tests/session-t.cc index 3d73a531d..2ad12f5dc 100644 --- a/devapi/tests/session-t.cc +++ b/devapi/tests/session-t.cc @@ -611,7 +611,7 @@ TEST_F(Sess, ssl_session) , mysqlx::Error); } - //using ssl-ca but ssl-enable = false on SessionSettings + //using ssl-ca but with the wrong CA { /* @@ -629,7 +629,7 @@ TEST_F(Sess, ssl_session) , Error); } - //using ssl-enable and ssl-ca as SessionSettings + //using ssl-mode=VERIFY_IDENTITY and ssl-ca as SessionSettings { diff --git a/include/mysqlx/xapi.h b/include/mysqlx/xapi.h index 15845e124..20673fed5 100644 --- a/include/mysqlx/xapi.h +++ b/include/mysqlx/xapi.h @@ -479,10 +479,10 @@ mysqlx_get_session(const char *host, int port, const char *user, Possible connection options are: - - `ssl-enable` : use TLS connection + - `ssl-mode` : TLS connection mode - `ssl-ca=`path : path to a PEM file specifying trusted root certificates - Specifying `ssl-ca` option implies `ssl-enable`. + Specifying `ssl-ca` option implies `ssl-mode=VERIFY_CA`. @param conn_string connection string @param[out] out_error if error happens during connect the error message