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 /extra | |
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 'extra')
-rw-r--r-- | extra/yassl/src/ssl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp index 67d2d428e51..05c260e80ca 100644 --- a/extra/yassl/src/ssl.cpp +++ b/extra/yassl/src/ssl.cpp @@ -1607,10 +1607,10 @@ unsigned long ERR_get_error() } - int SSL_CTX_use_certificate_chain_file(SSL_CTX*, const char*) + int SSL_CTX_use_certificate_chain_file(SSL_CTX* ctx, const char* file) { - // TDOD: - return SSL_SUCCESS; + // For the moment, treat like use_certificate_file + return read_file(ctx, file, SSL_FILETYPE_PEM, Cert); } |