diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-06-16 21:01:16 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-06-17 08:35:03 +0200 |
| commit | 9c577c2b9004a3afbff013a03794ffdfff088ed4 (patch) | |
| tree | 70fc8bcaa782250736b3dfbac2c5ca693a27a940 /sql/encryption.cc | |
| parent | a0d598a4d220fc3845cdee9c8b46ca10b4c1093e (diff) | |
| download | mariadb-git-9c577c2b9004a3afbff013a03794ffdfff088ed4.tar.gz | |
MDEV-22917 wolfssl might crash at startup when both SSL and encryption plugin are enabled
Make sure to initialize SSL early enough, when encryption plugins is loaded
Diffstat (limited to 'sql/encryption.cc')
| -rw-r--r-- | sql/encryption.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/encryption.cc b/sql/encryption.cc index fc07623883e..9c38713fdfa 100644 --- a/sql/encryption.cc +++ b/sql/encryption.cc @@ -18,6 +18,7 @@ #include "log.h" #include "sql_plugin.h" #include <my_crypt.h> +#include <violite.h> /* there can be only one encryption plugin enabled */ static plugin_ref encryption_manager= 0; @@ -63,6 +64,8 @@ int initialize_encryption_plugin(st_plugin_int *plugin) if (encryption_manager) return 1; + vio_check_ssl_init(); + if (plugin->plugin->init && plugin->plugin->init(plugin)) { sql_print_error("Plugin '%s' init function returned error.", |