diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-29 12:54:40 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-29 12:54:40 +0100 |
| commit | 68d6d4fc2b146a23a76d523ded543a22dac993a8 (patch) | |
| tree | 1174b850e582f78a14c781f59c3f87cd9e2aa083 /vio | |
| parent | bee1d88abfd7071a5d8c1a0c593d09cc65b26220 (diff) | |
| parent | e45a6a17022f9b83d4968b0a1a034ab25f2d1123 (diff) | |
| download | mariadb-git-68d6d4fc2b146a23a76d523ded543a22dac993a8.tar.gz | |
merge
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viosslfactories.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index d71021452d1..7c9269de853 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -100,7 +100,7 @@ vio_set_cert_stuff(SSL_CTX *ctx, const char *cert_file, const char *key_file, (long) ctx, cert_file, key_file)); if (cert_file) { - if (SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0) + if (SSL_CTX_use_certificate_chain_file(ctx, cert_file) <= 0) { *error= SSL_INITERR_CERT; DBUG_PRINT("error",("%s from file '%s'", sslGetErrString(*error), cert_file)); |