Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
2400f578
Unverified
Commit
2400f578
authored
Feb 03, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Feb 03, 2020
Browse files
Merge pull request #6808 from yossigo/fix/redis-cli-openssl-1.0.x
TLS: Fix missing initialization in redis-cli.
parents
726abe4d
93edb3ff
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/redis-cli.c
View file @
2400f578
...
@@ -49,6 +49,7 @@
...
@@ -49,6 +49,7 @@
#include <hiredis.h>
#include <hiredis.h>
#ifdef USE_OPENSSL
#ifdef USE_OPENSSL
#include <openssl/ssl.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
#include <hiredis_ssl.h>
#include <hiredis_ssl.h>
#endif
#endif
#include <sds.h>
/* use sds.h from hiredis, so that only one set of sds functions will be present in the binary */
#include <sds.h>
/* use sds.h from hiredis, so that only one set of sds functions will be present in the binary */
...
@@ -7933,6 +7934,14 @@ int main(int argc, char **argv) {
...
@@ -7933,6 +7934,14 @@ int main(int argc, char **argv) {
parseEnv
();
parseEnv
();
#ifdef USE_OPENSSL
if
(
config
.
tls
)
{
ERR_load_crypto_strings
();
SSL_load_error_strings
();
SSL_library_init
();
}
#endif
/* Cluster Manager mode */
/* Cluster Manager mode */
if
(
CLUSTER_MANAGER_MODE
())
{
if
(
CLUSTER_MANAGER_MODE
())
{
clusterManagerCommandProc
*
proc
=
validateClusterManagerCommand
();
clusterManagerCommandProc
*
proc
=
validateClusterManagerCommand
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment