diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-18 13:58:54 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-18 13:58:54 +0300 |
| commit | c515b1d092c62f346e512b91e5e68311892fe128 (patch) | |
| tree | 6cec2ad22507d67c865026c8f68c6aeb774459f1 /vio | |
| parent | baff3ba6e32d68876ec91fe808de8872088a393b (diff) | |
| parent | 205b0ce6ad21dbafe8def505307b4922398db5b2 (diff) | |
| download | mariadb-git-c515b1d092c62f346e512b91e5e68311892fe128.tar.gz | |
Merge 10.4 into 10.5
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 3783331e7df..d9fcc942a71 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(key_memory_vio_ssl_fd, |