From 77de2f401139e3563fc69919799ba6dd0218a9ed Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Tue, 10 Sep 2002 20:03:49 +0000
Subject: [PATCH] use crypto-headers.h

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11444 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 admin/ktutil_locl.h             |  7 +------
 appl/ftp/ftp/ftp_locl.h         |  6 +-----
 appl/otp/otp_locl.h             |  6 +-----
 appl/su/su.c                    |  6 +-----
 appl/telnet/libtelnet/enc_des.c |  6 +-----
 appl/telnet/libtelnet/encrypt.h |  4 +---
 kpasswd/kpasswd_locl.h          |  6 +-----
 lib/hdb/hdb_locl.h              |  6 +-----
 lib/krb5/krb5_locl.h            | 14 +-------------
 lib/otp/otp_md.c                | 10 +---------
 10 files changed, 10 insertions(+), 61 deletions(-)

diff --git a/admin/ktutil_locl.h b/admin/ktutil_locl.h
index 43021dbc1..af540a1ea 100644
--- a/admin/ktutil_locl.h
+++ b/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>
diff --git a/appl/ftp/ftp/ftp_locl.h b/appl/ftp/ftp/ftp_locl.h
index 4c37d9c8b..20a513d33 100644
--- a/appl/ftp/ftp/ftp_locl.h
+++ b/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*);
diff --git a/appl/otp/otp_locl.h b/appl/otp/otp_locl.h
index b6823a2f8..7af96305f 100644
--- a/appl/otp/otp_locl.h
+++ b/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>
diff --git a/appl/su/su.c b/appl/su/su.c
index ceeaf15e9..e844ec8c1 100644
--- a/appl/su/su.c
+++ b/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
diff --git a/appl/telnet/libtelnet/enc_des.c b/appl/telnet/libtelnet/enc_des.c
index d6412020e..2b4fb62c9 100644
--- a/appl/telnet/libtelnet/enc_des.c
+++ b/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;
 
diff --git a/appl/telnet/libtelnet/encrypt.h b/appl/telnet/libtelnet/encrypt.h
index 1b37cb582..6517084b0 100644
--- a/appl/telnet/libtelnet/encrypt.h
+++ b/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"
diff --git a/kpasswd/kpasswd_locl.h b/kpasswd/kpasswd_locl.h
index b2269d4c8..d4ebdb26a 100644
--- a/kpasswd/kpasswd_locl.h
+++ b/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__ */
diff --git a/lib/hdb/hdb_locl.h b/lib/hdb/hdb_locl.h
index fdec3683b..a7f8138b0 100644
--- a/lib/hdb/hdb_locl.h
+++ b/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>
diff --git a/lib/krb5/krb5_locl.h b/lib/krb5/krb5_locl.h
index 3a05eaa31..87f71e249 100644
--- a/lib/krb5/krb5_locl.h
+++ b/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>
diff --git a/lib/otp/otp_md.c b/lib/otp/otp_md.c
index 60900bb6b..6167135b6 100644
--- a/lib/otp/otp_md.c
+++ b/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