From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 17 Feb 2017 17:29:51 +0000 (+0000)
Subject: Revert r1783310 'Preserve OpenSSL 1.0.2 compatibility, following up on r1783305'
X-Git-Tag: 2.5.0-alpha~651
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fee7329281da952edd9fff6b8a46033d4199e9ef;p=apache

Revert r1783310 'Preserve OpenSSL 1.0.2 compatibility, following up on r1783305'

This was our first compatibility pattern but we are not preserving it, it seems
irrelevant since the death of 16 bit Windows object files.



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

diff --git a/modules/ssl/ssl_util_ocsp.c b/modules/ssl/ssl_util_ocsp.c
index d038980bc2..b11a6e924e 100644
--- a/modules/ssl/ssl_util_ocsp.c
+++ b/modules/ssl/ssl_util_ocsp.c
@@ -357,11 +357,7 @@ static STACK_OF(X509) *modssl_read_ocsp_certificates(const char *file)
     unsigned long err;
     STACK_OF(X509) *other_certs = NULL;
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-    if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
-#else
     if ((bio = BIO_new(BIO_s_file())) == NULL)
-#endif
         return NULL;
     if (BIO_read_filename(bio, file) <= 0) {
         BIO_free(bio);