httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1783432 - /httpd/httpd/trunk/modules/ssl/ssl_util_ocsp.c
Date Fri, 17 Feb 2017 17:29:51 GMT
Author: wrowe
Date: Fri Feb 17 17:29:51 2017
New Revision: 1783432

URL: http://svn.apache.org/viewvc?rev=1783432&view=rev
Log:
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.


Modified:
    httpd/httpd/trunk/modules/ssl/ssl_util_ocsp.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_util_ocsp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_ocsp.c?rev=1783432&r1=1783431&r2=1783432&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_util_ocsp.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_util_ocsp.c Fri Feb 17 17:29:51 2017
@@ -357,11 +357,7 @@ static STACK_OF(X509) *modssl_read_ocsp_
     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);



Mime
View raw message