diff --git a/changes-entries/mod_ssl-openssl-compat.txt b/changes-entries/mod_ssl-openssl-compat.txt new file mode 100644 index 00000000000..7b27a7f9b14 --- /dev/null +++ b/changes-entries/mod_ssl-openssl-compat.txt @@ -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 ] diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h index b2f5dfd385f..95fd9f7d4cb 100644 --- a/modules/ssl/ssl_private.h +++ b/modules/ssl/ssl_private.h @@ -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);