httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sander Temme <scte...@apache.org>
Subject Re: svn commit: r748396 - in /httpd/httpd/trunk: modules/ssl/ssl_engine_init.c modules/ssl/ssl_engine_kernel.c modules/ssl/ssl_engine_vars.c modules/ssl/ssl_util_ssl.c support/ab.c
Date Sat, 28 Feb 2009 15:45:49 GMT

On Feb 28, 2009, at 2:15 AM, Kaspar Brand wrote:

> Ruediger Pluem wrote:
>>
>> On 02/27/2009 06:16 AM, sctemme@apache.org wrote:
>>> Author: sctemme
>>> Date: Fri Feb 27 05:16:18 2009
>>> New Revision: 748396
>>>
>>> URL: http://svn.apache.org/viewvc?rev=748396&view=rev
>>> Log:
>>> The development trunk of OpenSSL has tightened up the type safety  
>>> of the STACK construct
>>> and the functions that manipulate it.  Make httpd trunk compile  
>>> against OpenSSL HEAD
>>> as well as OpenSSL 0.9.8j.  Also, get rid of some warnings.
>
> I filed a bug (+ patch) about this in August last year:
>
> https://issues.apache.org/bugzilla/show_bug.cgi?id=45521
>
> ... and find it rather irritating that the required modifications now
> appear to have been redone from scratch (not that I'm particularly  
> keen
> on getting my specific code into the tree, but two persons doing the
> same within a few months is pretty needless).

Oops, yes that was largely double work.  If anyting that should teach  
me to search Bugzilla before I start hacking.  In my defense, I was in  
a spot without connectivity when I did my patch.

You did get one part I didn't, the x509 name comparison callback:

-static int ssl_init_FindCAList_X509NameCmp(X509_NAME **a, X509_NAME  
**b)
+static int ssl_init_FindCAList_X509NameCmp(const X509_NAME * const *a,
+                                           const X509_NAME * const *b)

I just couldn't wrap my head around that there and then.  I'll pull  
that in, with attribution of course.


>> Hm. Now I get the following warning with openssl-0.9.8d:
>>
>> ab.c: In function 'main':
>> ab.c:2230: warning: passing argument 1 of 'SSL_CTX_new' discards  
>> qualifiers from pointer target type

Meh.  Investigating.


> It seems to me that the changes which constify SSL_CIPHER and  
> SSL_METHOD
> are not really related to the modifications for additional STACK type
> safety, or am I missing something?


Correct, it's the "also" part.

S.

-- 
Sander Temme
sctemme@apache.org
PGP FP: 51B4 8727 466A 0BC3 69F4  B7B8 B2BE BC40 1529 24AF




Mime
View raw message