OPENSSL_VERSION_NUMBER (Was: Cyrus SASL 2.1.10 Released)
ken at oceana.com
Tue Dec 10 11:04:28 EST 2002
Hack Kampbjørn wrote:
> On Tuesday 10 December 2002 15:16, Ken Murchison wrote:
> > Oops!
> > I pulled the wrong SASL address out of my address book. Please do not
> > send any more replies to ietf-sasl.
> > Ken
> > Peter 'Luna' Runestig wrote:
> > > Ken Murchison wrote:
> > > > 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,
> I think i've tracked this now. The two first OpenSSL 0.9.7 betas had removed
> the inclusion of all the other headers in <openssl/evp.h> this was reverted
> for beta 3. But the OpenBSD folk didn't like it so they removed the inclusion
> So we have that for OpenSSL versions < 0.9.7 the <openssl.evp.h> also includes
> <openssl/md5.h> as it does for betas >=3 (but not on OpenBSD). As otp.c
> wanted to use the openssl MD5 file and not the sasl's internal my previous
> patch was wrong. Just explicitly including <openssl/md5.h> seems a better
> solution as that's what we want. Possibly including this file twice shouldn't
> break anything.
> --- otp.c.orig Mon Oct 14 21:39:43 2002
> +++ otp.c Tue Dec 10 16:31:36 2002
> @@ -54,6 +54,7 @@
> #include <assert.h>
> #include <openssl/evp.h>
> +#include <openssl/md5.h>
> #include <sasl.h>
> #define MD5_H /* suppress internal MD5 */
So, if Peter can confirm that this works for him (both including
openssl/md5.h and _always_ defining MD5_H), then I'll go ahead commit
this to CVS.
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
More information about the Info-cyrus