* Makefile.in (CFLAGS): Add -I options to pick up include files

from the various algorithm subdirs.
* cryptoconf.c, des-crc.c, des-md5.c, raw-des.c:  Replace most
<.../...> include files with "..." includes.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4846 dc483132-0cff-0310-8789-dd5450dbe970

6 files changed, 24 insertions, 34 deletions

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 07ebbe008..cd2729530 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 25 19:55:59 1995  John Gilmore  (gnu at toad.com)
+
+	* Makefile.in (CFLAGS):  Add -I options to pick up include files
+	from the various algorithm subdirs.
+	* cryptoconf.c, des-crc.c, des-md5.c, raw-des.c:  Replace most
+	<.../...> include files with "..." includes.
+
 Tue Oct 18 15:46:01 1994  Mark Eichin  (eichin@cygnus.com)
 
 	* des-crc.c (mit_des_crc_decrypt_func): cast key->key->contents to
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 02116375f..054bff7d0 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -1,4 +1,4 @@
-CFLAGS = $(CCOPTS) $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS) -Icrc32 -Ides -Imd4 -Imd5
 LDFLAGS = -g
 
 TST=if test -n "`cat DONE`" ; then
diff --git a/src/lib/crypto/cryptoconf.c b/src/lib/crypto/cryptoconf.c
index a59cc3171..f027b9438 100644
--- a/src/lib/crypto/cryptoconf.c
+++ b/src/lib/crypto/cryptoconf.c
@@ -24,20 +24,17 @@
  * Cryptosystem configurations
  */
 
-
-#include <krb5/config.h>
-#include <krb5/osconf.h>
-#include <krb5/krb5.h>
+#include "k5-int.h"
 
 #if defined(PROVIDE_DES_CBC_CRC) || defined(PROVIDE_CRC32)
-#include <krb5/crc-32.h>
+#include "crc-32.h"
 #define CRC32_CKENTRY &crc32_cksumtable_entry
 #else
 #define CRC32_CKENTRY 0
 #endif
 
 #ifdef PROVIDE_RSA_MD4
-#include <krb5/rsa-md4.h>
+#include "rsa-md4.h"
 #define MD4_CKENTRY &rsa_md4_cksumtable_entry
 #define MD4_DES_CKENTRY &rsa_md4_des_cksumtable_entry
 #else
@@ -61,7 +58,7 @@
 #endif
 
 #ifdef PROVIDE_DES_CBC_CKSUM
-#include <krb5/mit-des.h>
+#include "des_int.h"
 #define _DES_DONE__
 #define DES_CBC_CKENTRY &krb5_des_cbc_cksumtable_entry
 #else
@@ -70,7 +67,7 @@
 
 #ifdef PROVIDE_DES_CBC_CRC
 #ifndef _DES_DONE__
-#include <krb5/mit-des.h>
+#include "des_int.h"
 #define _DES_DONE__
 #endif
 #define DES_CBC_CRC_CSENTRY &krb5_des_crc_cst_entry
@@ -80,7 +77,7 @@
 
 #ifdef PROVIDE_DES_CBC_MD5
 #ifndef _DES_DONE__
-#include <krb5/mit-des.h>
+#include "des_int.h"
 #define _DES_DONE__
 #endif
 #define DES_CBC_MD5_CSENTRY &krb5_des_md5_cst_entry
@@ -90,7 +87,7 @@
     
 #ifdef PROVIDE_RAW_DES_CBC
 #ifndef _DES_DONE__
-#include <krb5/mit-des.h>
+#include "des_int.h"
 #define _DES_DONE__
 #endif
 #define RAW_DES_CBC_CSENTRY &krb5_raw_des_cst_entry
diff --git a/src/lib/crypto/des-crc.c b/src/lib/crypto/des-crc.c
index 41258587c..51c6e24fc 100644
--- a/src/lib/crypto/des-crc.c
+++ b/src/lib/crypto/des-crc.c
@@ -19,15 +19,11 @@
  * permission.  M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- * 
  */
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/crc-32.h>
-
-#include "./des/des_int.h"
+#include "k5-int.h"
+#include "crc-32.h"
+#include "des_int.h"
 
 static krb5_error_code mit_des_crc_encrypt_func
     PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
diff --git a/src/lib/crypto/des-md5.c b/src/lib/crypto/des-md5.c
index 39adb1144..cb811b73b 100644
--- a/src/lib/crypto/des-md5.c
+++ b/src/lib/crypto/des-md5.c
@@ -19,15 +19,11 @@
  * permission.  M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- * 
  */
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
+#include "k5-int.h"
 #include <krb5/rsa-md5.h>
-
-#include "./des/des_int.h"
+#include "des_int.h"
 
 static krb5_error_code mit_des_md5_encrypt_func
     PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
diff --git a/src/lib/crypto/raw-des.c b/src/lib/crypto/raw-des.c
index 254c86223..9f710df96 100644
--- a/src/lib/crypto/raw-des.c
+++ b/src/lib/crypto/raw-des.c
@@ -1,7 +1,7 @@
 /*
- * lib/crypto/des-crc.32
+ * lib/crypto/raw-des.c
  *
- * Copyright 1994 by the Massachusetts Institute of Technology.
+ * Copyright 1994, 1995 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
  * Export of this software from the United States of America may
@@ -19,15 +19,10 @@
  * permission.  M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- * 
  */
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/crc-32.h>
-
-#include "./des/des_int.h"
+#include "k5-int.h"
+#include "des_int.h"
 
 static krb5_error_code mit_raw_des_encrypt_func
     PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
@@ -104,4 +99,3 @@ mit_raw_des_encrypt_func(in, out, size, key, ivec)
 				 ivec ? ivec : (krb5_pointer)key->key->contents,
 				 MIT_DES_ENCRYPT));
 }
-