Skip to content

Add compatibility define when building with OpenSSL3 #8837

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

Merged
bryancall merged 1 commit into from
May 12, 2022
Merged

Add compatibility define when building with OpenSSL3 #8837

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
19 changes: 19 additions & 0 deletions build/crypto.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,25 @@ int main() {
)
])

dnl
dnl Check OpenSSL Version 3
dnl
AC_DEFUN([TS_CHECK_OPENSSL3], [
AC_MSG_CHECKING([for OpenSSL version 3])
AC_RUN_IFELSE([AC_LANG_SOURCE(
[
#include <openssl/opensslv.h>
int main() {
if (OPENSSL_VERSION_NUMBER > 0x3000000fL) {
return 0;
}
return 1;
}
])],
[AC_MSG_RESULT(yes) TS_ADDTO(CPPFLAGS, -DOPENSSL_API_COMPAT=10002)], [AC_MSG_RESULT(no)]
)
])

dnl
dnl Since OpenSSL 1.1.0
dnl
Expand Down
3 changes: 3 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,6 +1251,9 @@ TS_CHECK_CRYPTO
# Check for OpenSSL Version
TS_CHECK_CRYPTO_VERSION

# Check for OpenSSL Version 3 and add compatiblity define if needed
TS_CHECK_OPENSSL3

# Check for openssl ASYNC jobs
TS_CHECK_CRYPTO_ASYNC

Expand Down