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
c2db3de4
Commit
c2db3de4
authored
Apr 22, 2020
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
8d672114
3e738c8a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/tls.c
View file @
c2db3de4
...
@@ -160,7 +160,7 @@ int tlsConfigure(redisTLSContextConfig *ctx_config) {
...
@@ -160,7 +160,7 @@ int tlsConfigure(redisTLSContextConfig *ctx_config) {
#endif
#endif
#ifdef SSL_OP_NO_CLIENT_RENEGOTIATION
#ifdef SSL_OP_NO_CLIENT_RENEGOTIATION
SSL_CTX_set_options
(
ssl
->
ctx
,
SSL_OP_NO_CLIENT_RENEGOTIATION
);
SSL_CTX_set_options
(
ctx
,
SSL_OP_NO_CLIENT_RENEGOTIATION
);
#endif
#endif
if
(
ctx_config
->
prefer_server_ciphers
)
if
(
ctx_config
->
prefer_server_ciphers
)
...
@@ -168,7 +168,9 @@ int tlsConfigure(redisTLSContextConfig *ctx_config) {
...
@@ -168,7 +168,9 @@ int tlsConfigure(redisTLSContextConfig *ctx_config) {
SSL_CTX_set_mode
(
ctx
,
SSL_MODE_ENABLE_PARTIAL_WRITE
|
SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER
);
SSL_CTX_set_mode
(
ctx
,
SSL_MODE_ENABLE_PARTIAL_WRITE
|
SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER
);
SSL_CTX_set_verify
(
ctx
,
SSL_VERIFY_PEER
|
SSL_VERIFY_FAIL_IF_NO_PEER_CERT
,
NULL
);
SSL_CTX_set_verify
(
ctx
,
SSL_VERIFY_PEER
|
SSL_VERIFY_FAIL_IF_NO_PEER_CERT
,
NULL
);
#if defined(SSL_CTX_set_ecdh_auto)
SSL_CTX_set_ecdh_auto
(
ctx
,
1
);
SSL_CTX_set_ecdh_auto
(
ctx
,
1
);
#endif
if
(
SSL_CTX_use_certificate_file
(
ctx
,
ctx_config
->
cert_file
,
SSL_FILETYPE_PEM
)
<=
0
)
{
if
(
SSL_CTX_use_certificate_file
(
ctx
,
ctx_config
->
cert_file
,
SSL_FILETYPE_PEM
)
<=
0
)
{
ERR_error_string_n
(
ERR_get_error
(),
errbuf
,
sizeof
(
errbuf
));
ERR_error_string_n
(
ERR_get_error
(),
errbuf
,
sizeof
(
errbuf
));
...
...
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