Skip to content

Fix compilation under OpenSSL 1.1 without deprecated APIs #47

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

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

Fix compilation under OpenSSL 1.1 without deprecated APIs #47

Show file tree
Hide file tree
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: 4 additions & 0 deletions ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,9 @@ static SSL_CTX *ssl_create_context(char *keyfile, char *certfile,
debug("continuing anyway...");
}
}
#if OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_CTX_set_tmp_rsa_callback(ssl_context, ssl_temp_rsa_cb);
#endif
SSL_CTX_set_info_callback(ssl_context, ssl_info_cb);
SSL_CTX_set_tlsext_status_cb(ssl_context, ssl_stapling_cb);
SSL_CTX_set_tlsext_servername_callback(ssl_context, ssl_sni_cb);
Expand Down Expand Up @@ -405,8 +407,10 @@ static SSL_CTX *ssl_create_context(char *keyfile, char *certfile,

int ssl_init(void)
{
#if OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_load_error_strings();
SSLeay_add_ssl_algorithms();
#endif
ssl_context = ssl_create_context(keyfile, certfile, cacert_dir, cacert_file);
if (ssl_context == NULL) {
error("Unable to create default context");
Expand Down
2 changes: 2 additions & 0 deletions ssl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#ifdef HAVE_LIBSSL
#include <openssl/ssl.h>
#include <openssl/err.h>
#include <openssl/bn.h>
#include <openssl/rsa.h>

#define SRV_SSL_V23 0
#define SRV_SSL_V2 1
Expand Down