Skip to content

Commit 57f1c92

Browse files
committed
Fix SSL/TLS version check issue with MariaDB Connector/C
Closes #351
1 parent ed435a5 commit 57f1c92

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

dbdimp.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@
107107
static inline bool ssl_verify_also_enforce_ssl(void) {
108108
#ifdef MARIADB_BASE_VERSION
109109
my_ulonglong version = mysql_get_client_version();
110-
return ((version >= 50544 && version < 50600) || (version >= 100020 && version < 100100) || version >= 100106);
110+
// MariaDB server versions: >=50000
111+
// MariaDB Connector/C versions: <50000
112+
return ((version >= 50544 && version < 50600) || (version >= 100020 && version < 100100) || version >= 100106 || version <50000);
111113
#else
112114
return false;
113115
#endif
@@ -117,7 +119,9 @@ static inline bool ssl_verify_also_enforce_ssl(void) {
117119
static inline bool ssl_verify_usable(void) {
118120
my_ulonglong version = mysql_get_client_version();
119121
#ifdef MARIADB_BASE_VERSION
120-
return ((version >= 50547 && version < 50600) || (version >= 100023 && version < 100100) || version >= 100110);
122+
// MariaDB server versions: >=50000
123+
// MariaDB Connector/C versions: <50000
124+
return ((version >= 50547 && version < 50600) || (version >= 100023 && version < 100100) || version >= 100110 || version < 50000);
121125
#else
122126
return ((version >= 50549 && version < 50600) || (version >= 50630 && version < 50700) || version >= 50712);
123127
#endif

0 commit comments

Comments
 (0)