compile error 2.1.21 with openssl-0.9.8

[Ken Murchison]

Ran Li wrote:

> Hello all,
> 
> When I compile cyrus-sasl-2.1.21 with openssl-0.9.8 on
> CentOS4.1(2.6.9-11.EL), I ran into the similar problem as below Alex
> metioned, I m not sure if anybody replied the message, if so please let
> me know. Thanks.

Try this quick patch.  It should compile, but I haven't tested the 
plugin to make sure that it still functions.  There probably is a better 
way to fix this, but I haven't looked into it yet.


Index: ntlm.c
===================================================================
RCS file: /afs/andrew/system/cvs/src/sasl/plugins/ntlm.c,v
retrieving revision 1.29
diff -u -r1.29 ntlm.c
--- ntlm.c      8 Dec 2004 12:13:55 -0000       1.29
+++ ntlm.c      30 Aug 2005 15:04:45 -0000
@@ -92,8 +92,14 @@
  #endif /* OpenSSL 0.9.7+ w/o old DES support */

  #include <sasl.h>
-#define MD5_H  /* suppress internal MD5 */
+#if (OPENSSL_VERSION_NUMBER <= 0x0090700f)
+# define MD5_H  /* suppress internal MD5 */
+#endif
  #include <saslplug.h>
+
+#ifndef MD5_DIGEST_LENGTH
+#define MD5_DIGEST_LENGTH 16
+#endif

  #include "plugin_common.h"


-- 
Kenneth Murchison     Oceana Matrix Ltd.
Software Engineer     2495 Main St. - Suite 401
716-604-0088 x26      Buffalo, NY 14214
--PGP Public Key--    http://www.oceana.com/~ken/ksm.pgp