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.

Sign up for GitHub

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

tcp: avoid deprecated ENGINE_cleanup #266

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tcp: avoid deprecated ENGINE_cleanup #266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/tcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@
# if OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER)
# include <openssl/bioerr.h>
# endif
# include <openssl/engine.h>
/* OpenSSL API differences */
# if OPENSSL_VERSION_NUMBER >= 0x10100000L
# define RSYSLOG_X509_NAME_oneline(X509CERT) X509_get_subject_name(X509CERT)
# define RSYSLOG_BIO_method_name(SSLBIO) BIO_method_name(SSLBIO)
# define RSYSLOG_BIO_number_read(SSLBIO) BIO_number_read(SSLBIO)
# define RSYSLOG_BIO_number_written(SSLBIO) BIO_number_written(SSLBIO)
# else
# include <openssl/engine.h>
# define RSYSLOG_X509_NAME_oneline(X509CERT) (X509CERT != NULL ? X509CERT->cert_info->subject : NULL)
# define RSYSLOG_BIO_method_name(SSLBIO) SSLBIO->method->name
# define RSYSLOG_BIO_number_read(SSLBIO) SSLBIO->num
Expand Down Expand Up @@ -1989,7 +1989,9 @@ relpTcpExitTLS_ossl(void)
SSL_CTX_free(ctx);
ctx = NULL;
}
#if OPENSSL_VERSION_NUMBER < 0x10100000L
ENGINE_cleanup();
#endif
ERR_free_strings();
EVP_cleanup();
CRYPTO_cleanup_all_ex_data();
Expand Down