toolkit compat for PEM_read_bio_X509

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94213 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h
index dc94f053c771c594f8b175d3734bcd71bd4a2745..0f799d51d5def2555f0dbd84cc3e0cec58e0a5bf 100644 (file)
--- a/modules/ssl/ssl_toolkit_compat.h
+++ b/modules/ssl/ssl_toolkit_compat.h
@@ -46,7 +46,9 @@
 #define MODSSL_BIO_CB_ARG_TYPE const char
 #define MODSSL_CRYPTO_CB_ARG_TYPE const char
 
-#define modssl_X509_verify_cert(c) X509_verify_cert(c)
+#define modssl_X509_verify_cert X509_verify_cert
+
+#define modssl_PEM_read_bio_X509 PEM_read_bio_X509
 
 #define modssl_set_cipher_list SSL_set_cipher_list
 
@@ -66,6 +68,9 @@
 
 #define modssl_X509_verify_cert(c) X509_verify_cert(c, NULL)
 
+#define modssl_PEM_read_bio_X509(b, x, cb, arg) \
+   PEM_read_bio_X509(b, x, cb)
+
 /* XXX: add configure check */
 #ifndef HAVE_SSL_SET_STATE
 #define SSL_set_state(ssl, state)

diff --git a/modules/ssl/ssl_util_ssl.c b/modules/ssl/ssl_util_ssl.c
index d56b4b9394945aed64f84e5a8b8e245f8754a5a7..b16d3244809c8ca8baa9c6ebcceaf074f84e7b2e 100644 (file)
--- a/modules/ssl/ssl_util_ssl.c
+++ b/modules/ssl/ssl_util_ssl.c
@@ -486,11 +486,7 @@ int SSL_CTX_use_certificate_chain(
     }
     /* optionally skip a leading server certificate */
     if (skipfirst) {
-#if SSL_LIBRARY_VERSION < 0x00904000
-        if ((x509 = PEM_read_bio_X509(bio, NULL, cb)) == NULL) {
-#else
-        if ((x509 = PEM_read_bio_X509(bio, NULL, cb, NULL)) == NULL) {
-#endif
+        if ((x509 = modssl_PEM_read_bio_X509(bio, NULL, cb, NULL)) == NULL) {
             BIO_free(bio);
             return -1;
         }