OPENSSL_VERSION_NUMBER (Was: Cyrus SASL 2.1.10 Released)

[Ken Murchison]

OK.  I now have two conflicting reports regarding testing for
OPENSSL_VERSION_NUMBER with OpenSSL 0.9.7 (both quoted below).  Could
somebody who has 0.9.7 installed please try to figure out what the deal
is?  I tend to believe that I was originally correct in including the
check, and I'm confused as to why it doesn't work for Peter using the
same release as Hack.

Ken


Hack Kampbjorn wrote:
> 
> More problems: with cyrus-sasl version 2.1.9 plugins/otp.c only defined
> MD5_H for OpenSSL versions < 0.9.7 but in version 2.1.10 the check is
> removed. OpenBSD 3.2 ships with OpenSSL 0.9.7-beta3 30 Jul 2000
> (0x00907003L) and fails with this error:
> 
> /bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H -I.
> -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/plugins
> -I..
> -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/include
> -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/lib
> -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/sasldb
>   -I/usr/local/include -I/usr/include/kerberosIV
> -I/usr/include/kerberosV -I/usr/include  -Wall -W -Wall -O2
> -I/usr/include/kerberosV -c
> /usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/plugins/otp.c
> rm -f .libs/otp.lo
> cc -DHAVE_CONFIG_H -I.
> -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/plugins
> -I..
> -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/include
> -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/lib
> -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/sasldb
> -I/usr/local/include -I/usr/include/kerberosIV -I/usr/include/kerberosV
> -I/usr/include -Wall -W -Wall -O2 -I/usr/include/kerberosV -c
> /usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/plugins/otp.c
>   -fPIC -DPIC -o .libs/otp.lo
> /usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/plugins/otp.c:59:
> invalid preprocessing directive name
> /usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/plugins/otp.c:61:
> invalid preprocessing directive name
> *** Error code 1
> 
> Stop in
> /usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/build-i386/plugins.
> 
> Adding the version check back fixes this problem.
> --- plugins/otp.c.orig  Tue Dec 10 01:33:54 2002
> +++ plugins/otp.c       Tue Dec 10 01:39:44 2002
> @@ -56,7 +56,9 @@
>   #include <openssl/evp.h>
> 
>   #include <sasl.h>
> +#if OPENSSL_VERSION_NUMBER < 0x00907000L
>   #define MD5_H  /* suppress internal MD5 */
> +#endif
>   #include <saslplug.h>
> 
>   #include "plugin_common.h"
> 


Peter 'Luna' Runestig wrote:
> 
> Hi all!
> 
> What's the deal with this part in plugins/otp.c (2.1.8):
> 
> #if OPENSSL_VERSION_NUMBER < 0x00907000L
> #define MD5_H  /* suppress internal MD5 */
> #endif
> 
> As it stands, the code doesn't compile with openssl-0.9.7-beta3 (if I
> remove the version check, it does). Do you expect MD5 support to be
> dropped in future versions of openssl, or what?

-- 
Kenneth Murchison     Oceana Matrix Ltd.
Software Engineer     21 Princeton Place
716-662-8973 x26      Orchard Park, NY 14127
--PGP Public Key--    http://www.oceana.com/~ken/ksm.pgp