]> granicus.if.org Git - apache/commitdiff
Revert r1783310 'Preserve OpenSSL 1.0.2 compatibility, following up on r1783305'
authorWilliam A. Rowe Jr <wrowe@apache.org>
Fri, 17 Feb 2017 17:29:51 +0000 (17:29 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Fri, 17 Feb 2017 17:29:51 +0000 (17:29 +0000)
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

modules/ssl/ssl_util_ocsp.c

index d038980bc27eefa085fcaef1ec5f4cad7201f475..b11a6e924e5786241986e5dd22dbcc47978880dd 100644 (file)
@@ -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);