Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6867F200C1D for ; Thu, 16 Feb 2017 22:41:58 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6703E160B6F; Thu, 16 Feb 2017 21:41:58 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A8357160B52 for ; Thu, 16 Feb 2017 22:41:57 +0100 (CET) Received: (qmail 53004 invoked by uid 500); 16 Feb 2017 21:41:56 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 52995 invoked by uid 99); 16 Feb 2017 21:41:56 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2017 21:41:56 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 3EE8E3A0EDB for ; Thu, 16 Feb 2017 21:41:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1783310 - /httpd/httpd/trunk/modules/ssl/ssl_util_ocsp.c Date: Thu, 16 Feb 2017 21:41:55 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170216214156.3EE8E3A0EDB@svn01-us-west.apache.org> archived-at: Thu, 16 Feb 2017 21:41:58 -0000 Author: wrowe Date: Thu Feb 16 21:41:55 2017 New Revision: 1783310 URL: http://svn.apache.org/viewvc?rev=1783310&view=rev Log: Preserve OpenSSL 1.0.2 compatibility, following up on r1783305 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=1783310&r1=1783309&r2=1783310&view=diff ============================================================================== --- httpd/httpd/trunk/modules/ssl/ssl_util_ocsp.c (original) +++ httpd/httpd/trunk/modules/ssl/ssl_util_ocsp.c Thu Feb 16 21:41:55 2017 @@ -357,7 +357,11 @@ 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);