Skip to content

[2.4.x] mod_ssl: fix compat with OpenSSL 1.0 #742

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
notroj wants to merge 1 commit into
base: 2.4.x
Choose a base branch
from
Open

[2.4.x] mod_ssl: fix compat with OpenSSL 1.0 #742

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
3 changes: 3 additions & 0 deletions changes-entries/mod_ssl-openssl-compat.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*) mod_ssl: Fix OpenSSL compatibility macros for X509_get0_notBefore,
X509_get0_notAfter, and X509_get0_serialNumber with OpenSSL < 1.1.
PR 70205. [Craig Lorentzen <crlorent amazon.com>]
5 changes: 3 additions & 2 deletions modules/ssl/ssl_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,9 @@
#define EVP_PKEY_up_ref(pk) (CRYPTO_add(&(pk)->references, +1, CRYPTO_LOCK_EVP_PKEY))
#define ASN1_STRING_get0_data(x) ((x)->data)
#define ASN1_STRING_length(x) ((int)(x)->length)
#define X509_get0_before(x) X509_get_before(x)
#define X509_get0_after(x) X509_get_after(x)
#define X509_get0_serialNumber(x) X509_get_serialNumber(x)
#define X509_get0_notBefore(x) X509_get_notBefore(x)
#define X509_get0_notAfter(x) X509_get_notAfter(x)
#else
void init_bio_methods(void);
void free_bio_methods(void);
Expand Down
Loading