luo980/hiredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 69d24d042d into 77bcc73ebb

Browse Source
This commit is contained in:
masariello 2025-02-12 14:18:54 +00:00 committed by GitHub
commit 6086ab418f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ssl.c
View File

@ -288,27 +288,32 @@ redisSSLContext *redisCreateSSLContextWithOptions(redisSSLOptions *options, redi
if (capath || cacert_filename) { if (capath || cacert_filename) {
#ifdef _WIN32 #ifdef _WIN32
if (0 == strcmp(cacert_filename, "wincert")) { if (0 == strcmp(cacert_filename, "wincert")) {
win_store = CertOpenSystemStore(NULL, "Root"); char const* const subsystems[2] = { "Root", "CA" };
if (!win_store) { for (int i=0; i<2; ++i)
if (error) *error = REDIS_SSL_CTX_OS_CERTSTORE_OPEN_FAILED; {
goto error; char const * const subsys = subsystems[i];
} win_store = CertOpenSystemStore(0, subsys);
X509_STORE* store = SSL_CTX_get_cert_store(ctx->ssl_ctx); if (!win_store) {
while (win_ctx = CertEnumCertificatesInStore(win_store, win_ctx)) { if (error) *error = REDIS_SSL_CTX_OS_CERTSTORE_OPEN_FAILED;
X509* x509 = NULL; goto error;
x509 = d2i_X509(NULL, (const unsigned char**)&win_ctx->pbCertEncoded, win_ctx->cbCertEncoded);
if (x509) {
if ((1 != X509_STORE_add_cert(store, x509)) ||
(1 != SSL_CTX_add_client_CA(ctx->ssl_ctx, x509)))
{
if (error) *error = REDIS_SSL_CTX_OS_CERT_ADD_FAILED;
goto error;
}
X509_free(x509);
} }
X509_STORE* store = SSL_CTX_get_cert_store(ctx->ssl_ctx);
while (0 != (win_ctx = CertEnumCertificatesInStore(win_store, win_ctx))) {
X509* x509 = NULL;
x509 = d2i_X509(NULL, (const unsigned char**)&win_ctx->pbCertEncoded, win_ctx->cbCertEncoded);
if (x509) {
if ((1 != X509_STORE_add_cert(store, x509)) ||
(1 != SSL_CTX_add_client_CA(ctx->ssl_ctx, x509)))
{
if (error) *error = REDIS_SSL_CTX_OS_CERT_ADD_FAILED;
goto error;
}
X509_free(x509);
}
}
CertFreeCertificateContext(win_ctx);
CertCloseStore(win_store, 0);
} }
CertFreeCertificateContext(win_ctx);
CertCloseStore(win_store, 0);
} else } else
#endif #endif
if (!SSL_CTX_load_verify_locations(ctx->ssl_ctx, cacert_filename, capath)) { if (!SSL_CTX_load_verify_locations(ctx->ssl_ctx, cacert_filename, capath)) {