diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-27 01:14:54 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-27 01:14:54 +0100 |
| commit | 4c6426fc751374aaa89c54d9d4d616c026cdd725 (patch) | |
| tree | c9121bdf4136efe80edf78cbc0eb71f37cf7a989 /vio | |
| parent | a6eb0991c92c4b46b0372ed080fa226b73fbc0dc (diff) | |
| download | mariadb-git-4c6426fc751374aaa89c54d9d4d616c026cdd725.tar.gz | |
Fix LPBUG# : allow chain certificate files to work.
Contributed by Maarten Vanraes (AL13N)
Fix things so that chains of certificates work in the server and client
certificate files.
This only really works for OpenSSL-based builds, as yassl is unable to read
multiple certificates from a file. The patch below to yassl/src/ssl.cpp
doesn't fix that, but just arranges that the viosslfactories.c patch won't
have any ill effects in a yassl build.
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)); |