Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 85313 invoked from network); 6 Jul 2005 16:50:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Jul 2005 16:50:12 -0000 Received: (qmail 13363 invoked by uid 500); 6 Jul 2005 16:50:02 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 13338 invoked by uid 500); 6 Jul 2005 16:50:02 -0000 Mailing-List: contact dev-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 dev@httpd.apache.org Received: (qmail 13321 invoked by uid 99); 6 Jul 2005 16:50:02 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jul 2005 09:50:02 -0700 X-ASF-Spam-Status: No, hits=0.1 required=10.0 tests=FORGED_RCVD_HELO X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [207.155.252.72] (HELO thunderer.cnchost.com) (207.155.252.72) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jul 2005 09:50:02 -0700 Received: from rcsv650.rowe-clan.net (c-24-13-128-132.hsd1.il.comcast.net [24.13.128.132]) by thunderer.cnchost.com id MAA03458; Wed, 6 Jul 2005 12:49:58 -0400 (EDT) [ConcentricHost SMTP Relay 1.17] Errors-To: Message-Id: <6.2.1.2.2.20050706114623.0b990da0@pop3.rowe-clan.net> X-Mailer: QUALCOMM Windows Eudora Version 6.2.1.2 Date: Wed, 06 Jul 2005 11:49:46 -0500 To: dev@httpd.apache.org From: "William A. Rowe, Jr." Subject: Re: Patch for 2.0.54 + OpenSSL 0.9.8 In-Reply-To: <42CC0498.3070805@force-elite.com> References: <20050705123248.GE23007@2scale.net> <6.2.1.2.2.20050706101645.0c642350@pop3.rowe-clan.net> <42CC0498.3070805@force-elite.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N At 11:19 AM 7/6/2005, Paul Querna wrote: >William A. Rowe, Jr. wrote: >>At 07:32 AM 7/5/2005, Georg v. Zezschwitz wrote: >> >>>However, currently 2.0.54 cannot be built with 0.9.8beta6, as >>>a pem.h-definition has changed. The OpenSSL-team considers this >>>renaming as a bug correction, so compilation of mod_ssl will >>>go on to fail. >> >>I've committed that fix to both 2.0 and 2.1 trees, thank you! >>In the future please separate each functional change into its >>own patch. > >Whoa there. This should not of been committed to the 2.0 tree >directly. There was no vote. I didn't see anyone else even give >it a +1 on the mailing list. > >That said, it is a simple change, and I will give it a +1, but >pleeeeease don't do that, 2.0.x is under RTC. Fair enough :) But I would not proceed to the 2.0 GA without this passing muster. That's two, so can Paul and I get another +1? Patch follows. Votes/Comments? Bill --- httpd/httpd/branches/2.0.x/modules/ssl/ssl_toolkit_compat.h (original) +++ httpd/httpd/branches/2.0.x/modules/ssl/ssl_toolkit_compat.h Wed Jul 6 08:10:36 2005 @@ -99,6 +99,13 @@ #define HAVE_SSL_X509V3_EXT_d2i #endif +#ifndef PEM_F_DEF_CALLBACK +#ifdef PEM_F_PEM_DEF_CALLBACK +/* In OpenSSL 0.9.8 PEM_F_DEF_CALLBACK was renamed */ +#define PEM_F_DEF_CALLBACK PEM_F_PEM_DEF_CALLBACK +#endif +#endif + #elif defined (SSLC_VERSION_NUMBER) /* RSA */ /* sslc does not support this function, OpenSSL has since 9.5.1 */