use crypto-headers.h

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11444 ec53bebd-3082-4978-b11e-865c3cabbd6b

admin/ktutil_locl.h

@@ -54,12 +54,7 @@
 #include <parse_time.h>
 #include <roken.h>
 
-#ifdef HAVE_OPENSSL
-#include <openssl/des.h>
-#else
-#include <des.h>
-#endif
-
+#include "crypto-headers.h"
 #include <krb5.h>
 #include <kadm5/admin.h>
 #include <kadm5/kadm5_err.h>

appl/ftp/ftp/ftp_locl.h

@@ -131,11 +131,7 @@ struct hostent  *gethostbyname(const char *);
 #include "security.h"
 
 /* des_read_pw_string */
-#ifdef HAVE_OPENSSL
-#include <openssl/des.h>
-#else
-#include <des.h>
-#endif
+#include "crypto-headers.h"
 
 #if defined(__sun__) && !defined(__svr4)
 int fclose(FILE*);

appl/otp/otp_locl.h

@@ -52,9 +52,5 @@
 #endif
 #include <roken.h>
 #include <err.h>
-#ifdef HAVE_OPENSSL
-#include <openssl/des.h>
-#else
-#include <des.h>
-#endif
+#include "crypto-headers.h" /* for des_read_pw_string */
 #include <otp.h>

appl/su/su.c

@@ -50,11 +50,7 @@ RCSID("$Id$");
 
 #include <pwd.h>
 
-#ifdef HAVE_OPENSSL
-#include <openssl/des.h>
-#else
-#include <des.h>
-#endif
+#include "crypto-headers.h"
 #ifdef KRB5
 #include <krb5.h>
 #endif

appl/telnet/libtelnet/enc_des.c

@@ -50,11 +50,7 @@ RCSID("$Id$");
 #include "encrypt.h"
 #include "misc-proto.h"
 
-#ifdef HAVE_OPENSSL
-#include <openssl/des.h>
-#else
-#include <des.h>
-#endif
+#include "crypto-headers.h"
 
 extern int encrypt_debug_mode;
 

appl/telnet/libtelnet/encrypt.h

@@ -90,11 +90,9 @@ typedef struct {
 
 #define	SK_DES		1	/* Matched Kerberos v5 KEYTYPE_DES */
 
+#include "crypto-headers.h"
 #ifdef HAVE_OPENSSL
-#include <openssl/des.h>
 #define des_new_random_key des_random_key
-#else
-#include <des.h>
 #endif
 
 #include "enc-proto.h"

kpasswd/kpasswd_locl.h

@@ -98,11 +98,7 @@
 #include <err.h>
 #include <roken.h>
 #include <getarg.h>
-#ifdef HAVE_OPENSSL
-#include <openssl/des.h>
-#else
-#include <des.h>
-#endif
 #include <krb5.h>
+#include "crypto-headers.h" /* for des_read_pw_string */
 
 #endif /* __KPASSWD_LOCL_H__ */

lib/hdb/hdb_locl.h

@@ -56,11 +56,7 @@
 #endif
 #include <roken.h>
 
-#ifdef HAVE_OPENSSL
-#include <openssl/des.h>
-#else
-#include <des.h>
-#endif
+#include "crypto-headers.h"
 #include <krb5.h>
 #include <hdb.h>
 #include <hdb-private.h>

lib/krb5/krb5_locl.h

@@ -112,19 +112,7 @@ struct sockaddr_dl;
 #include <parse_time.h>
 #include <base64.h>
 
-#ifdef HAVE_OPENSSL
-#include <openssl/des.h>
-#include <openssl/md4.h>
-#include <openssl/md5.h>
-#include <openssl/sha.h>
-#include <openssl/rc4.h>
-#else
-#include <des.h>
-#include <md4.h>
-#include <md5.h>
-#include <sha.h>
-#include <rc4.h>
-#endif
+#include "crypto-headers.h"
 
 #include <krb5_asn1.h>
 #include <der.h>

lib/otp/otp_md.c

@@ -38,15 +38,7 @@ RCSID("$Id$");
 #include "otp_locl.h"
 
 #include "otp_md.h"
-#ifdef HAVE_OPENSSL
-#include <openssl/md4.h>
-#include <openssl/md5.h>
-#include <openssl/sha.h>
-#else
-#include <md4.h>
-#include <md5.h>
-#include <sha.h>
-#endif
+#include "crypto-headers.h"
 
 /*
  * Compress len bytes from md into key