jaltman> Eric Young designed his DES library to be symbol and struct compatible
jaltman> with the MIT Kerberos DES. There should be no need to include both.
jaltman> Excluding the MIT des.h with #define DES_DEFS is the appropriate way
jaltman> to go.
Basically, you're saying that this patch should do the trick?
Index: crypto/des/des.h
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/des/des.h,v
retrieving revision 1.17
diff -u -r1.17 des.h
--- crypto/des/des.h 1999/06/09 18:01:49 1.17
+++ crypto/des/des.h 1999/07/27 22:20:40
@@ -59,6 +59,10 @@
#ifndef HEADER_DES_H
#define HEADER_DES_H
+/* To avoid conflicts with MIT Kerberos DES */
+#ifndef DES_DEFS
+#define DES_DEFS
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -245,6 +249,8 @@
#ifdef __cplusplus
}
+#endif
+
#endif
#endif
--
Richard Levitte \ Spannv�gen 38, II \ [EMAIL PROTECTED]
Redakteur@Stacken \ S-161 43 BROMMA \ T: +46-8-26 52 47
\ SWEDEN \ or +46-708-26 53 44
Procurator Odiosus Ex Infernis -- [EMAIL PROTECTED]
Unsolicited commercial email is subject to an archival fee of $400.
See <http://www.stacken.kth.se/~levitte/mail/> for more info.
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [EMAIL PROTECTED]
Automated List Manager [EMAIL PROTECTED]
