Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tiny enhacements #98

Merged
merged 2 commits into from
May 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = 'en'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand Down
3 changes: 2 additions & 1 deletion src/netlog/netlog-tls.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ int tls_connect(TLSManager *m, SocketAddress *address) {
return log_error_errno(SYNTHETIC_ERRNO(EIO),
"Failed to SSL_set_fd: %s",
ERR_error_string(ERR_get_error(), NULL));

/* Cerification verification */
if (m->auth_mode != OPEN_SSL_CERTIFICATE_AUTH_MODE_NONE && m->auth_mode != OPEN_SSL_CERTIFICATE_AUTH_MODE_INVALID) {
log_debug("TLS: enable certificate verification");
Expand All @@ -234,7 +233,9 @@ int tls_connect(TLSManager *m, SocketAddress *address) {
log_debug("TLS: disable certificate verification");
SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL);
}

SSL_CTX_set_default_verify_paths(ctx);
SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);

r = SSL_connect(ssl);
if (r <= 0)
Expand Down