Skip to content

Commit 5ed7719

Browse files
committed
Fix pre-1.1.0 compat macros for X509_get0_notBefore/notAfter/serialNumber
The compat macros added in 83d565f for pre-1.1.0 OpenSSL used incorrect names (X509_get0_before/X509_get0_after) which don't match the actual API names used in the code (X509_get0_notBefore/X509_get0_notAfter). This caused link failures when building against OpenSSL 1.0.2. Also add missing X509_get0_serialNumber compat macro which was used in ssl_engine_log.c but never shimmed for pre-1.1.0. Submitted by: Craig Lorentzen <crlorent amazon.com> Github: closes #673 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1935577 13f79535-47bb-0310-9956-ffa450edef68
1 parent 5f25f77 commit 5ed7719

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*) mod_ssl: Fix OpenSSL compatibility macros for X509_get0_notBefore,
2+
X509_get0_notAfter, and X509_get0_serialNumber with OpenSSL < 1.1.
3+
[Craig Lorentzen <crlorent amazon.com>]

modules/ssl/ssl_private.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,9 @@
290290
#define EVP_PKEY_up_ref(pk) (CRYPTO_add(&(pk)->references, +1, CRYPTO_LOCK_EVP_PKEY))
291291
#define ASN1_STRING_get0_data(x) ((x)->data)
292292
#define ASN1_STRING_length(x) ((int)(x)->length)
293-
#define X509_get0_before(x) X509_get_before(x)
294-
#define X509_get0_after(x) X509_get_after(x)
293+
#define X509_get0_serialNumber(x) X509_get_serialNumber(x)
294+
#define X509_get0_notBefore(x) X509_get_notBefore(x)
295+
#define X509_get0_notAfter(x) X509_get_notAfter(x)
295296
#else
296297
void init_bio_methods(void);
297298
void free_bio_methods(void);

0 commit comments

Comments
 (0)