zeekling/hiredis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
michael-grunder 2020-10-18 14:23:38 -07:00
parent 6693863f4c
commit e7dda97859
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ssl.c
View File

@ -245,22 +245,19 @@ redisSSLContext *redisCreateSSLContext(const char *cacert_filename, const char *
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"); win_store = CertOpenSystemStore(NULL, "Root");
if (!win_store) if (!win_store) {
{
if (error) *error = REDIS_SSL_CTX_OS_CERTSTORE_OPEN_FAILED; if (error) *error = REDIS_SSL_CTX_OS_CERTSTORE_OPEN_FAILED;
goto error; goto error;
} }
X509_STORE* store = SSL_CTX_get_cert_store(ctx->ssl_ctx); X509_STORE* store = SSL_CTX_get_cert_store(ctx->ssl_ctx);
while (win_ctx = CertEnumCertificatesInStore(win_store, win_ctx)) while (win_ctx = CertEnumCertificatesInStore(win_store, win_ctx)) {
{
X509* x509 = NULL; X509* x509 = NULL;
x509 = d2i_X509(NULL, (const unsigned char**)&win_ctx->pbCertEncoded, win_ctx->cbCertEncoded); x509 = d2i_X509(NULL, (const unsigned char**)&win_ctx->pbCertEncoded, win_ctx->cbCertEncoded);
if (x509) if (x509) {
{ if ((1 != X509_STORE_add_cert(store, x509)) ||
if ((1 != X509_STORE_add_cert(store, x509)) || (1 != SSL_CTX_add_client_CA(ctx->ssl_ctx, x509))) (1 != SSL_CTX_add_client_CA(ctx->ssl_ctx, x509)))
{ {
if (error) *error = REDIS_SSL_CTX_OS_CERT_ADD_FAILED; if (error) *error = REDIS_SSL_CTX_OS_CERT_ADD_FAILED;
goto error; goto error;
@ -270,8 +267,7 @@ redisSSLContext *redisCreateSSLContext(const char *cacert_filename, const char *
} }
CertFreeCertificateContext(win_ctx); CertFreeCertificateContext(win_ctx);
CertCloseStore(win_store, 0); 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)) {
if (error) *error = REDIS_SSL_CTX_CA_CERT_LOAD_FAILED; if (error) *error = REDIS_SSL_CTX_CA_CERT_LOAD_FAILED;