From 701143b90db1f1eb684b3a6c881a862c2aa12d1f Mon Sep 17 00:00:00 2001 From: John Gilmore Date: Thu, 26 Jan 1995 04:09:51 +0000 Subject: [PATCH] * cbc_cksum.c, cs_entry.c, des.h, destest.c, f_sched.c, fin_rndkey.c, finish_key.c, init_rkey.c, key_sched.c, new_rn_key.c, process_ky.c, random_key.c, string2key.c, verify.c, weak_key.c: Replace <.../...> includes with "..."s. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4848 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/des/ChangeLog | 7 +++++++ src/lib/crypto/des/cbc_cksum.c | 6 +----- src/lib/crypto/des/cs_entry.c | 8 ++------ src/lib/crypto/des/des.h | 3 +-- src/lib/crypto/des/destest.c | 6 ++---- src/lib/crypto/des/f_sched.c | 3 +-- src/lib/crypto/des/fin_rndkey.c | 5 +---- src/lib/crypto/des/finish_key.c | 6 +----- src/lib/crypto/des/init_rkey.c | 7 +------ src/lib/crypto/des/key_sched.c | 6 ++---- src/lib/crypto/des/new_rn_key.c | 5 +---- src/lib/crypto/des/process_ky.c | 8 +------- src/lib/crypto/des/random_key.c | 8 ++------ src/lib/crypto/des/string2key.c | 6 +----- src/lib/crypto/des/verify.c | 8 ++------ src/lib/crypto/des/weak_key.c | 4 +--- 16 files changed, 27 insertions(+), 69 deletions(-) diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index 431586bf5..63cbd48cb 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,10 @@ +Wed Jan 25 20:04:39 1995 John Gilmore (gnu at toad.com) + + * cbc_cksum.c, cs_entry.c, des.h, destest.c, f_sched.c, + fin_rndkey.c, finish_key.c, init_rkey.c, key_sched.c, + new_rn_key.c, process_ky.c, random_key.c, string2key.c, verify.c, + weak_key.c: Replace <.../...> includes with "..."s. + Wed Jan 25 16:54:40 1995 Chris Provenzano (proven@mit.edu) * Removed all narrow types and references to wide.h and narrow.h diff --git a/src/lib/crypto/des/cbc_cksum.c b/src/lib/crypto/des/cbc_cksum.c index 625326f0a..7f57b842b 100644 --- a/src/lib/crypto/des/cbc_cksum.c +++ b/src/lib/crypto/des/cbc_cksum.c @@ -29,11 +29,7 @@ * */ - - -#include -#include - +#include "k5-int.h" #include "des_int.h" /* diff --git a/src/lib/crypto/des/cs_entry.c b/src/lib/crypto/des/cs_entry.c index 941f174de..ba0768238 100644 --- a/src/lib/crypto/des/cs_entry.c +++ b/src/lib/crypto/des/cs_entry.c @@ -1,7 +1,7 @@ /* * lib/crypto/des/cs_entry.c * - * Copyright 1990,1991 by the Massachusetts Institute of Technology. + * Copyright 1990, 1991, 1995 by the Massachusetts Institute of Technology. * All Rights Reserved. * * Export of this software from the United States of America may @@ -24,11 +24,7 @@ * DES encryption interface file */ - - -#include -#include - +#include "k5-int.h" #include "des_int.h" extern krb5_error_code mit_des_cbc_checksum PROTOTYPE ((krb5_pointer , diff --git a/src/lib/crypto/des/des.h b/src/lib/crypto/des/des.h index e268aa718..81cfef3f4 100644 --- a/src/lib/crypto/des/des.h +++ b/src/lib/crypto/des/des.h @@ -13,8 +13,7 @@ #ifndef DES_DEFS #define DES_DEFS -#include -#include +#include "k5-int.h" #ifndef KRB_INT32 #define KRB_INT32 long diff --git a/src/lib/crypto/des/destest.c b/src/lib/crypto/des/destest.c index 71c2c6f8e..46008f6f1 100644 --- a/src/lib/crypto/des/destest.c +++ b/src/lib/crypto/des/destest.c @@ -25,10 +25,8 @@ */ -#include -#include -#include -#include +#include "k5-int.h" +#include "com_err.h" extern int errno; extern mit_des_ecb_encrypt(); diff --git a/src/lib/crypto/des/f_sched.c b/src/lib/crypto/des/f_sched.c index 6ba6079d6..7b8c36f7a 100644 --- a/src/lib/crypto/des/f_sched.c +++ b/src/lib/crypto/des/f_sched.c @@ -11,8 +11,7 @@ * des_make_sched.c - permute a DES key, returning the resulting key schedule */ #include "des.h" -#include -#include +#include "k5-int.h" /* * Permuted choice 1 tables. These are used to extract bits diff --git a/src/lib/crypto/des/fin_rndkey.c b/src/lib/crypto/des/fin_rndkey.c index 37905c160..ea718b2be 100644 --- a/src/lib/crypto/des/fin_rndkey.c +++ b/src/lib/crypto/des/fin_rndkey.c @@ -23,10 +23,7 @@ * */ - -#include -#include -#include +#include "k5-int.h" /* free any resources held by "seed" and assigned by init_random_key() diff --git a/src/lib/crypto/des/finish_key.c b/src/lib/crypto/des/finish_key.c index b70b679ea..29de40d66 100644 --- a/src/lib/crypto/des/finish_key.c +++ b/src/lib/crypto/des/finish_key.c @@ -23,11 +23,7 @@ * */ - -#include -#include - -#include +#include "k5-int.h" /* does any necessary clean-up on the eblock (such as releasing diff --git a/src/lib/crypto/des/init_rkey.c b/src/lib/crypto/des/init_rkey.c index 954adf254..09eb32703 100644 --- a/src/lib/crypto/des/init_rkey.c +++ b/src/lib/crypto/des/init_rkey.c @@ -19,14 +19,9 @@ * 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 -#include - +#include "k5-int.h" #include "des_int.h" /* diff --git a/src/lib/crypto/des/key_sched.c b/src/lib/crypto/des/key_sched.c index 0e8850686..914e77a86 100644 --- a/src/lib/crypto/des/key_sched.c +++ b/src/lib/crypto/des/key_sched.c @@ -44,11 +44,9 @@ * Originally written 6/85 by Steve Miller, MIT Project Athena. */ - -#include - -#include +#include "k5-int.h" #include "des_int.h" +#include void make_key_sched PROTOTYPE((mit_des_cblock, mit_des_key_schedule)); diff --git a/src/lib/crypto/des/new_rn_key.c b/src/lib/crypto/des/new_rn_key.c index 084c63fc8..b6c14745b 100644 --- a/src/lib/crypto/des/new_rn_key.c +++ b/src/lib/crypto/des/new_rn_key.c @@ -30,10 +30,7 @@ * without license from the U.S. Commerce department. */ - -#include -#include -#include +#include "k5-int.h" #include "des_int.h" #ifndef min diff --git a/src/lib/crypto/des/process_ky.c b/src/lib/crypto/des/process_ky.c index a2214f63d..e684f5af5 100644 --- a/src/lib/crypto/des/process_ky.c +++ b/src/lib/crypto/des/process_ky.c @@ -19,15 +19,9 @@ * 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 -#include - +#include "k5-int.h" #include "des_int.h" /* diff --git a/src/lib/crypto/des/random_key.c b/src/lib/crypto/des/random_key.c index 009e26db4..1642e111c 100644 --- a/src/lib/crypto/des/random_key.c +++ b/src/lib/crypto/des/random_key.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 -#include - +#include "k5-int.h" #include "des_int.h" + /* generate a random encryption key, allocating storage for it and filling in the keyblock address in *keyblock diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c index d4d8b8849..0cbfea2bd 100644 --- a/src/lib/crypto/des/string2key.c +++ b/src/lib/crypto/des/string2key.c @@ -19,13 +19,9 @@ * 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 -#include - +#include "k5-int.h" #include "des_int.h" /* diff --git a/src/lib/crypto/des/verify.c b/src/lib/crypto/des/verify.c index 0d70bd708..14ae1af2a 100644 --- a/src/lib/crypto/des/verify.c +++ b/src/lib/crypto/des/verify.c @@ -28,15 +28,11 @@ * -1 ==> error */ - -#include -#include -#include +#include "k5-int.h" #include "des_int.h" #include -#include +#include "com_err.h" -extern int errno; extern krb5_cryptosystem_entry mit_des_cryptosystem_entry; char *progname; diff --git a/src/lib/crypto/des/weak_key.c b/src/lib/crypto/des/weak_key.c index d96caa5d4..bc6b20264 100644 --- a/src/lib/crypto/des/weak_key.c +++ b/src/lib/crypto/des/weak_key.c @@ -29,9 +29,7 @@ * Originally written 8/85 by Steve Miller, MIT Project Athena. */ - -#include -#include +#include "k5-int.h" #include "des_int.h" /* -- 2.26.2