jaltman> > +/* To avoid conflicts with MIT Kerberos DES */
jaltman> > +#ifndef DES_DEFS
jaltman> > +#define DES_DEFS
jaltman> > +
jaltman>
jaltman> Yes. Assuming that the OpenSSL des.h is always read before the
jaltman> MIT one.
Hmm, I wanted to avoid that assumption, but that was assuming all
function names and definitions would be the same. Apparently, to get
that right, this would be the needed patch (at least if I understand
the info you gave correctly. I don't have access to MIT Kerberos):
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:48:40
@@ -59,6 +59,24 @@
#ifndef HEADER_DES_H
#define HEADER_DES_H
+/* We want to avoid conflicts with MIT Kerberos DES. According to the info
+ we've been given, all functions are the same, both by name and definition,
+ except for a few that have different names. /Richard Levitte */
+#ifdef DES_DEFS
+
+/* This maps OpenSSL names to MIT Kerberos DES ones */
+#define des_random_key des_new_random_key
+#define des_random_seed des_set_random_generator_seed
+#define des_set_odd_parity des_fixup_key_parity
+
+#else
+
+#define DES_DEFS
+/* This maps MIT Kerberos DES names to OpenSSL ones */
+#define des_new_random_key des_random_key
+#define des_set_random_generator_seed des_random_seed
+#define des_fixup_key_parity des_set_odd_parity
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -245,6 +263,8 @@
#ifdef __cplusplus
}
+#endif
+
#endif
#endif
Do you have the possibility to check if this works, independent of the
order of niclusion?
--
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]
