database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

MDEV-29817: Issues with handling options for SSL CRLs (and some others)

Browse Source 
This commit fixes a bug related to reading the value of the ssl_cipher
instead of ssl_crl, and also adds handling of the forgotten tls_version
option.
This commit is contained in:
Julius Goryavsky
2022-10-27 13:25:35 +02:00
parent 7c78239680
commit 57852875f1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libmariadb/mariadb_lib.c
View File

@@ -3911,11 +3911,15 @@ mysql_get_optionv(MYSQL *mysql, enum mysql_option option, void *arg, ...)
*((char **)arg)= mysql->options.ssl_cipher;
break;
case MYSQL_OPT_SSL_CRL:
*((char **)arg)= mysql->options.extension ? mysql->options.ssl_cipher : NULL;
*((char **)arg)= mysql->options.extension ? mysql->options.extension->ssl_crl : NULL;
break;
case MYSQL_OPT_SSL_CRLPATH:
*((char **)arg)= mysql->options.extension ? mysql->options.extension->ssl_crlpath : NULL;
break;
case MARIADB_OPT_TLS_VERSION:
case MYSQL_OPT_TLS_VERSION:
*((char **)arg)= mysql->options.extension ? mysql->options.extension->tls_version : NULL;
break;
case MYSQL_OPT_CONNECT_ATTRS:
/* mysql_get_optionsv(mysql, MYSQL_OPT_CONNECT_ATTRS, keys, vals, elements) */
{