From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 5 Apr 2012 20:00:32 +0000 (-0400)
Subject: rxkad: Remove DES include from header file
X-Git-Tag: upstream/1.8.0_pre1^2~2554
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=bb16c6f38f30c59be1849e3b30cad6928530066b;p=packages%2Fo%2Fopenafs.git

rxkad: Remove DES include from header file

Remove the hcrypto/des.h include directory from the rxkad_prototypes
header file. We ship rxkad_prototypes.h, but we don't ship the hcrypto
headers. Having an installed header depend upon an uninstalled one is
a pain when building out-of-tree code like perl-AFS.

Change-Id: Idac93ba834c84f6f9e2e49361f88d0e357a328d6
Reviewed-on: http://gerrit.openafs.org/7068
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
---

diff --git a/src/rxkad/rxkad_prototypes.h b/src/rxkad/rxkad_prototypes.h
index 0f935e7a3..9fa059ff1 100644
--- a/src/rxkad/rxkad_prototypes.h
+++ b/src/rxkad/rxkad_prototypes.h
@@ -14,8 +14,6 @@
 #include "fcrypt.h"
 #include "rx/rx.h"
 
-#include <hcrypto/des.h>
-
 /* crypt_conn.c */
 extern afs_int32 rxkad_DecryptPacket(const struct rx_connection *conn,
 				     const fc_KeySchedule * schedule,
diff --git a/src/rxkad/ticket.c b/src/rxkad/ticket.c
index 52d65fa74..e543bbc6b 100644
--- a/src/rxkad/ticket.c
+++ b/src/rxkad/ticket.c
@@ -13,6 +13,8 @@
 
 #include <roken.h>
 
+#include <hcrypto/des.h>
+
 #include <rx/xdr.h>
 #include <rx/rx.h>
 
diff --git a/src/rxkad/ticket5.c b/src/rxkad/ticket5.c
index 2ab58df1c..f0e830cf4 100644
--- a/src/rxkad/ticket5.c
+++ b/src/rxkad/ticket5.c
@@ -69,6 +69,7 @@
 
 #include <hcrypto/md4.h>
 #include <hcrypto/md5.h>
+#include <hcrypto/des.h>
 
 #include "lifetimes.h"
 #include "rxkad.h"