diff options
| -rw-r--r-- | ssl.c | 18 | 
1 files changed, 7 insertions, 11 deletions
| @@ -245,22 +245,19 @@ redisSSLContext *redisCreateSSLContext(const char *cacert_filename, const char *      if (capath || cacert_filename) {  #ifdef _WIN32 -        if (0 == strcmp(cacert_filename, "wincert")) -        { +        if (0 == strcmp(cacert_filename, "wincert")) {              win_store = CertOpenSystemStore(NULL, "Root"); -            if (!win_store) -            { +            if (!win_store) {                  if (error) *error = REDIS_SSL_CTX_OS_CERTSTORE_OPEN_FAILED;                  goto error;              }              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 = 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 (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; @@ -270,8 +267,7 @@ redisSSLContext *redisCreateSSLContext(const char *cacert_filename, const char *              }              CertFreeCertificateContext(win_ctx);              CertCloseStore(win_store, 0); -        } -        else +        } else  #endif          if (!SSL_CTX_load_verify_locations(ctx->ssl_ctx, cacert_filename, capath)) {              if (error) *error = REDIS_SSL_CTX_CA_CERT_LOAD_FAILED; | 
