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 /vio | |
| 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 'vio')
| -rw-r--r-- | vio/viosslfactories.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 4a31ebd1798..80d1e55f358 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -150,7 +150,7 @@ vio_set_cert_stuff(SSL_CTX *ctx, const char *cert_file, const char *key_file, } -static void check_ssl_init() +void vio_check_ssl_init() { if (!ssl_algorithms_added) { @@ -243,7 +243,7 @@ new_VioSSLFd(const char *key_file, const char *cert_file, crl_file ? crl_file : "NULL", crl_path ? crl_path : "NULL")); - check_ssl_init(); + vio_check_ssl_init(); if (!(ssl_fd= ((struct st_VioSSLFd*) my_malloc(sizeof(struct st_VioSSLFd),MYF(0))))) |