Re: svn commit: r835046 - /httpd/httpd/trunk/modules/ssl/ssl_engine_init.c

[William A. Rowe Jr.]

rpluem@... wrote:
> Author: rpluem
> Date: Wed Nov 11 20:27:10 2009
> New Revision: 835046
>
> URL: http://svn.apache.org/viewvc?rev=835046&view=rev
> Log:
> * Use correct #ifndef's to compile again on openssl 0.9.8 and fix compiler
>   warnings.

>          ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
> -#if SSL_LIBRARY_VERSION >= 0x00908000
> +#ifndef OPENSSL_NO_EC

Silly question; this breaks all 0.9.7 builds, right?  Is that deliberate?

[Ruediger Pluem]

On 11/11/2009 09:38 PM, William A. Rowe Jr. wrote:

> rpluem@... wrote:
>> Author: rpluem
>> Date: Wed Nov 11 20:27:10 2009
>> New Revision: 835046
>>
>> URL: http://svn.apache.org/viewvc?rev=835046&view=rev
>> Log:
>> * Use correct #ifndef's to compile again on openssl 0.9.8 and fix compiler
>>   warnings.
>
>>          ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
>> -#if SSL_LIBRARY_VERSION >= 0x00908000
>> +#ifndef OPENSSL_NO_EC
>
> Silly question; this breaks all 0.9.7 builds, right?  Is that deliberate?

It shouldn't. Does it (no 0.9.7 at hand right now)?

Regards

Rüdiger

[Ruediger Pluem]

On 11/11/2009 09:45 PM, Ruediger Pluem wrote:

>
> On 11/11/2009 09:38 PM, William A. Rowe Jr. wrote:
>> rpluem@... wrote:
>>> Author: rpluem
>>> Date: Wed Nov 11 20:27:10 2009
>>> New Revision: 835046
>>>
>>> URL: http://svn.apache.org/viewvc?rev=835046&view=rev
>>> Log:
>>> * Use correct #ifndef's to compile again on openssl 0.9.8 and fix compiler
>>>   warnings.
>>>          ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
>>> -#if SSL_LIBRARY_VERSION >= 0x00908000
>>> +#ifndef OPENSSL_NO_EC
>> Silly question; this breaks all 0.9.7 builds, right?  Is that deliberate?
>
> It shouldn't. Does it (no 0.9.7 at hand right now)?

No it doesn't:

Modified: httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h
URL:
http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h?rev=834378&r1=834377&r2=834378&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h Tue Nov 10 07:55:13 2009
@@ -48,6 +48,11 @@
 #include <openssl/ocsp.h>
 #endif

+/* ECC support came along in OpenSSL 1.0.0 */
+#if (OPENSSL_VERSION_NUMBER < 0x10000000)
+#define OPENSSL_NO_EC
+#endif
+
 /** Avoid tripping over an engine build installed globally and detected
  * when the user points at an explicit non-engine flavor of OpenSSL
  */

Regards

Rüdiger

[William A. Rowe Jr.]

Ruediger Pluem wrote:

>
>>> Silly question; this breaks all 0.9.7 builds, right?  Is that deliberate?
>> It shouldn't. Does it (no 0.9.7 at hand right now)?
> No it doesn't:
>
> --- httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h (original)
> +++ httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h Tue Nov 10 07:55:13 2009
>
> +/* ECC support came along in OpenSSL 1.0.0 */
> +#if (OPENSSL_VERSION_NUMBER < 0x10000000)
> +#define OPENSSL_NO_EC
> +#endif
> +

Can we PLEASE use the same hack for OCSP to avoid taking five different solutions
to the very same problem set?  That would be kindness :)

:)