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

Fix compilation for Ubuntu and openssl >= 1.1 #1069

Merged
merged 1 commit into from
Oct 9, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/XrdHttp/XrdHttpProtocol.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1657,12 +1657,11 @@ int XrdHttpProtocol::InitSecurity() {


const SSL_METHOD *meth;



#if OPENSSL_VERSION_NUMBER >= 0x10100000L
meth = TLS_method();
eDest.Say(" Using TLS");
#elif HAVE_TLS
eDest.Say(" Using TLS_method");
#elif defined (HAVE_TLS)
meth = TLS_method();
eDest.Say(" Using TLS");
#elif defined (HAVE_TLS12)
Expand Down