Avoid <krb5/...> includes

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

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index be20248e02d3ed74b7f05fa62feb85e82acaaf57..0c17f78c5957f7c16e0b41e2a0c55c6cb91e1a96 100644 (file)
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 00:15:06 1995  John Gilmore  (gnu at toad.com)
+
+       * cryptoconf.c, des_md5.c:  Avoid <krb5/...> includes.
+
 Fri Feb  3 02:44:07 1995  John Gilmore  <gnu@cygnus.com>
 
        Rename files so that they work in the DOS LIB command,

diff --git a/src/lib/crypto/cryptoconf.c b/src/lib/crypto/cryptoconf.c
index f027b9438d5742a8c3d0fa5001ad60df09da843c..cd46f75e021dee0390c486cab361619f29bb6c1d 100644 (file)
--- a/src/lib/crypto/cryptoconf.c
+++ b/src/lib/crypto/cryptoconf.c
@@ -43,7 +43,7 @@
 #endif
 
 #ifdef PROVIDE_RSA_MD5
-#include <krb5/rsa-md5.h>
+#include "rsa-md5.h"
 #define MD5_CKENTRY &rsa_md5_cksumtable_entry
 #define MD5_DES_CKENTRY &rsa_md5_des_cksumtable_entry
 #else
@@ -98,7 +98,7 @@
 
 /* WARNING:
    make sure the order of entries in these tables matches the #defines in
-   <krb5/encryption.h>
+   "krb5/encryption.h"
  */
 
 krb5_cs_table_entry *krb5_csarray[] = {

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 236cfb2070e24ef46b5e90cfb0c585c3d2f7cb17..119c9b3db689b8f379c920bb20f75685dc771582 100644 (file)
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 00:18:38 1995  John Gilmore  (gnu at toad.com)
+
+       * des_int.h:  Avoid <krb5/...> includes.
+
 Mon Feb 20 16:10:29 1995 Keith Vetter (keithv@fusion.com)
 
        * Makefile.in: made to work under windows PC

diff --git a/src/lib/crypto/des/des_int.h b/src/lib/crypto/des/des_int.h
index ea82e07e23a25a10ec007e9b5f41f8ba73b0ef34..4e1a7cfe3d367c85542b16eb88adb6389c742709 100644 (file)
--- a/src/lib/crypto/des/des_int.h
+++ b/src/lib/crypto/des/des_int.h
@@ -28,7 +28,7 @@
 #ifndef DES_INTERNAL_DEFS
 #define DES_INTERNAL_DEFS
 
-#include <krb5/mit-des.h>
+#include "mit-des.h"           /* From include/krb5 */
 
 /* cbc_cksum.c */
 extern krb5_error_code INTERFACE mit_des_cbc_checksum

diff --git a/src/lib/crypto/des_md5.c b/src/lib/crypto/des_md5.c
index 0b359867d0981e4fbe014dbc8aaec42ab7d00792..35ef6e5144e996dd3e75227c27dc22b9f8ead375 100644 (file)
--- a/src/lib/crypto/des_md5.c
+++ b/src/lib/crypto/des_md5.c
@@ -22,7 +22,7 @@
  */
 
 #include "k5-int.h"
-#include <krb5/rsa-md5.h>
+#include "rsa-md5.h"
 #include "des_int.h"
 
 krb5_error_code INTERFACE mit_des_md5_encrypt_func

diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog
index e5ea22d558517bfd3e5d49f6c86bd967eafdb92b..907c5c34aaa608f1adb3a36f39b483087b9093cc 100644 (file)
--- a/src/lib/crypto/md4/ChangeLog
+++ b/src/lib/crypto/md4/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 00:19:06 1995  John Gilmore  (gnu at toad.com)
+
+       * rsa-md4.h:  Avoid <krb5/...> includes.
+
 Mon Feb 20 15:54:1 1995 Keith Vetter (keithv@fusion.com)
 
        * Makefile.in: made to work for the PC

diff --git a/src/lib/crypto/md4/rsa-md4.h b/src/lib/crypto/md4/rsa-md4.h
index 05012168b8092d6a022399521af56dfc359cb4d7..0fdf17f15d831686bfd07a104f1ee49eceef7b0c 100644 (file)
--- a/src/lib/crypto/md4/rsa-md4.h
+++ b/src/lib/crypto/md4/rsa-md4.h
@@ -73,8 +73,8 @@ extern krb5_checksum_entry
  **********************************************************************
  */
 
-#include <krb5/config.h>
-#include <krb5/wordsize.h>
+#include <k5-config.h>
+#include <wordsize.h>
 
 /* Data structure for MD4 (Message Digest) computation */
 typedef struct {

diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
index e1e6837c8b4c42419abe03d094b36272db5addd8..35c518e56be2edc996febeb6da934b089566863a 100644 (file)
--- a/src/lib/crypto/md5/ChangeLog
+++ b/src/lib/crypto/md5/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 28 00:20:15 1995  John Gilmore  (gnu at toad.com)
+
+       * md5.c, md5crypto.c, md5glue.c, t_mddriver.c:  Avoid <krb5/...>
+       includes.
+
 Mon Feb 20 15:54:1 1995 Keith Vetter (keithv@fusion.com)
 
        * Makefile.in: made to work for the PC

diff --git a/src/lib/crypto/md5/md5.c b/src/lib/crypto/md5/md5.c
index 11d358918a630dec586b61b662b1601962bc8c3e..885bdb4265b6f7c218db8c008793b6eb0623e022 100644 (file)
--- a/src/lib/crypto/md5/md5.c
+++ b/src/lib/crypto/md5/md5.c
@@ -36,7 +36,7 @@
  */
 
 #include "k5-int.h"
-#include <krb5/rsa-md5.h>
+#include "rsa-md5.h"
 
 #ifdef __STDC__
 #define UL(x) x##UL

diff --git a/src/lib/crypto/md5/md5crypto.c b/src/lib/crypto/md5/md5crypto.c
index 264802a2e11f22ebc8730a6e39b6b2995c9bd633..bb2fba504015827b10d090987547ecbc722361d3 100644 (file)
--- a/src/lib/crypto/md5/md5crypto.c
+++ b/src/lib/crypto/md5/md5crypto.c
@@ -1,5 +1,5 @@
 #include "k5-int.h"
-#include <krb5/rsa-md5.h>
+#include "rsa-md5.h"
 #include "des_int.h"   /* we cheat a bit and call it directly... */
 
 krb5_error_code INTERFACE

diff --git a/src/lib/crypto/md5/md5glue.c b/src/lib/crypto/md5/md5glue.c
index 4e9d1e8f72801c3e14e6af550f93a7cb46b76dbc..4514c895f76c5958f580c959df1709670170dee6 100644 (file)
--- a/src/lib/crypto/md5/md5glue.c
+++ b/src/lib/crypto/md5/md5glue.c
@@ -1,5 +1,5 @@
 #include "k5-int.h"
-#include <krb5/rsa-md5.h>
+#include "rsa-md5.h"
 
 krb5_error_code INTERFACE
 md5_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length,

diff --git a/src/lib/crypto/md5/t_mddriver.c b/src/lib/crypto/md5/t_mddriver.c
index 760c2cccfdfcc51444a143e523fb2e9913091406..9b642b7df12c9ff9d94db2616fe52fdfe53b64fd 100644 (file)
--- a/src/lib/crypto/md5/t_mddriver.c
+++ b/src/lib/crypto/md5/t_mddriver.c
@@ -29,7 +29,7 @@ documentation and/or software.
 #include "rsa-md4.h"
 #endif
 #if MD == 5
-#include <krb5/rsa-md5.h>
+#include "rsa-md5.h"
 #endif
 
 /* Length of test block, number of test blocks.

diff --git a/src/lib/krb425/425error.c b/src/lib/krb425/425error.c
index 19626024a75db42716cd175ab077b31b908642d6..02166bf156f84896ecb81278069dd112c921f2d4 100644 (file)
--- a/src/lib/krb425/425error.c
+++ b/src/lib/krb425/425error.c
@@ -26,7 +26,7 @@
 
 
 #include <krb.h>
-#include <krb5/krb5.h>
+#include "krb5.h"
 
 int    krb5_425_error;         /* For people who want to know what */
                                /* the *real* error was....  */

diff --git a/src/lib/krb425/ChangeLog b/src/lib/krb425/ChangeLog
index 17f35c05217448a20181b91700860479b9f3d1fb..3716ef6a44136c8e586e2dd300c07d3908e6abe7 100644 (file)
--- a/src/lib/krb425/ChangeLog
+++ b/src/lib/krb425/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 28 00:23:19 1995  John Gilmore  (gnu at toad.com)
+
+       * cksum.c, des.c, des.h, enc_dec.c, pcbc_encrypt.c, quad_cksum.c,
+       read_passwd.c, string2key.c, weak_key.c:  Avoid <krb5/...> includes.
+
 Fri Sep 30 22:00:19 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * realmhost.c (krb_realmofhost): index->strchr

diff --git a/src/lib/krb425/kn_parse.c b/src/lib/krb425/kn_parse.c
index 51d5b2ba0a524fb7bd12297ef230991156a81dc6..769d0b1002e4d86c9fdae1961e6a8501b7fff717 100644 (file)
--- a/src/lib/krb425/kn_parse.c
+++ b/src/lib/krb425/kn_parse.c
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include <krb.h>
-#include <krb5/osconf.h>
+#include "k5-int.h"
 
 /* max size of full name */
 #define FULL_SZ (ANAME_SZ + INST_SZ + REALM_SZ)

diff --git a/src/lib/krb425/krb425.h b/src/lib/krb425/krb425.h
index 064a643482bcfdf707c6f806098185619b151ca6..03b9afabf843ec43d079f869db1c0c34018cc4ec 100644 (file)
--- a/src/lib/krb425/krb425.h
+++ b/src/lib/krb425/krb425.h
@@ -31,12 +31,9 @@
 #include <ctype.h>
 #include <netdb.h>
 #include <krb.h>
-#include <krb5/krb5.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
+#include "k5-int.h"
 #include <netinet/in.h>
 #include <stdio.h>
-#include <krb5/ext-proto.h>
 
 #define min(a,b)       ((a) < (b) ? (a) : (b))