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

diff --git a/changes-entries/mod_ssl-openssl-compat.txt b/changes-entries/mod_ssl-openssl-compat.txt
new file mode 100644 (file)
index 0000000..f11c76e
--- /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.
+     [Craig Lorentzen <crlorent amazon.com>]

diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index 442b8b17ae4f14ee1f7dfffa42df2b27c3ae3a56..a34b034f26591b1319a26de7f8555b8f59e4506f 100644 (file)
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -290,8 +290,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);