From 7994497147230abfa075484fdecaf04fb2d8637d Mon Sep 17 00:00:00 2001 From: John Kohl Date: Wed, 23 May 1990 11:28:49 +0000 Subject: [PATCH] include file fix-ups git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@911 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/des/cbc_cksum.c | 3 --- src/lib/crypto/des/cksum.c | 7 +++---- src/lib/crypto/des/enc_dec.c | 3 --- src/lib/crypto/des/fin_rndkey.c | 3 --- src/lib/crypto/des/finish_key.c | 3 --- src/lib/crypto/des/init_rkey.c | 4 ---- src/lib/crypto/des/key_parity.c | 4 ++-- src/lib/crypto/des/key_sched.c | 4 ++-- src/lib/crypto/des/make_e.c | 7 ++++--- src/lib/crypto/des/make_fp.c | 6 +++--- src/lib/crypto/des/make_ip.c | 8 ++++---- src/lib/crypto/des/make_kp.c | 11 +++++------ src/lib/crypto/des/make_odd.c | 4 ++-- src/lib/crypto/des/make_p.c | 6 +++--- src/lib/crypto/des/make_pt.c | 8 ++++---- src/lib/crypto/des/make_s.c | 8 ++++---- src/lib/crypto/des/make_st.c | 8 ++++---- src/lib/crypto/des/misc.c | 7 +++---- src/lib/crypto/des/new_rn_key.c | 8 ++++---- src/lib/crypto/des/process_ky.c | 5 +---- src/lib/crypto/des/random_key.c | 4 +--- src/lib/crypto/des/string2key.c | 5 +---- src/lib/crypto/des/verify.c | 9 +++------ src/lib/crypto/des/weak_key.c | 5 +++-- src/lib/kdb/decrypt_key.c | 2 -- src/lib/kdb/encrypt_key.c | 2 -- src/lib/kdb/fetch_mkey.c | 6 +----- src/lib/kdb/kdb_dbm.c | 16 ++-------------- src/lib/kdb/setup_mkey.c | 1 - src/lib/kdb/store_mkey.c | 7 +------ src/lib/kdb/verify_mky.c | 3 --- 31 files changed, 60 insertions(+), 117 deletions(-) diff --git a/src/lib/crypto/des/cbc_cksum.c b/src/lib/crypto/des/cbc_cksum.c index 6bb8ef9eb..fada85099 100644 --- a/src/lib/crypto/des/cbc_cksum.c +++ b/src/lib/crypto/des/cbc_cksum.c @@ -24,11 +24,8 @@ static char des_cbc_checksum_c[] = #include -#include - #include #include -#include #include "des_int.h" diff --git a/src/lib/crypto/des/cksum.c b/src/lib/crypto/des/cksum.c index 15952cdc0..1bcbab097 100644 --- a/src/lib/crypto/des/cksum.c +++ b/src/lib/crypto/des/cksum.c @@ -25,11 +25,10 @@ static char rcsid_cksum_c[] = "$Id$"; #endif /* !lint & !SABER */ -#include -#include -#include - +#include #include +#include + #include "des_int.h" extern int mit_des_debug; diff --git a/src/lib/crypto/des/enc_dec.c b/src/lib/crypto/des/enc_dec.c index 0036546e4..72f19e139 100644 --- a/src/lib/crypto/des/enc_dec.c +++ b/src/lib/crypto/des/enc_dec.c @@ -30,9 +30,6 @@ static char rcsid_enc_dec_c[] = #include -#include -#include - #include #include #include diff --git a/src/lib/crypto/des/fin_rndkey.c b/src/lib/crypto/des/fin_rndkey.c index b70792314..02f588c09 100644 --- a/src/lib/crypto/des/fin_rndkey.c +++ b/src/lib/crypto/des/fin_rndkey.c @@ -15,9 +15,6 @@ static char des_fnr_key_c[] = #endif /* !lint & !SABER */ #include - -#include - #include #include #include diff --git a/src/lib/crypto/des/finish_key.c b/src/lib/crypto/des/finish_key.c index 338688e9f..39f7db22f 100644 --- a/src/lib/crypto/des/finish_key.c +++ b/src/lib/crypto/des/finish_key.c @@ -15,9 +15,6 @@ static char des_fin_key_c[] = #endif /* !lint & !SABER */ #include - -#include - #include #include diff --git a/src/lib/crypto/des/init_rkey.c b/src/lib/crypto/des/init_rkey.c index 8094222b6..02be2234c 100644 --- a/src/lib/crypto/des/init_rkey.c +++ b/src/lib/crypto/des/init_rkey.c @@ -15,12 +15,8 @@ static char des_inr_key_c[] = #endif /* !lint & !SABER */ #include - -#include - #include #include -#include #include "des_int.h" diff --git a/src/lib/crypto/des/key_parity.c b/src/lib/crypto/des/key_parity.c index 62d2f4971..ca7c62aea 100644 --- a/src/lib/crypto/des/key_parity.c +++ b/src/lib/crypto/des/key_parity.c @@ -19,10 +19,10 @@ #if !defined(lint) && !defined(SABER) static char key_parity_c[] = -"$Header$"; +"$Id$"; #endif /* !lint & !SABER */ -#include +#include #include #include "des_int.h" diff --git a/src/lib/crypto/des/key_sched.c b/src/lib/crypto/des/key_sched.c index 3c5518133..b396e018f 100644 --- a/src/lib/crypto/des/key_sched.c +++ b/src/lib/crypto/des/key_sched.c @@ -32,10 +32,10 @@ #if !defined(lint) && !defined(SABER) static char key_sched_c[] = -"$Header$"; +"$Id$"; #endif /* !lint & !SABER */ -#include +#include #include #include diff --git a/src/lib/crypto/des/make_e.c b/src/lib/crypto/des/make_e.c index 032eff291..6842f55ff 100644 --- a/src/lib/crypto/des/make_e.c +++ b/src/lib/crypto/des/make_e.c @@ -2,17 +2,18 @@ * $Source$ * $Author$ * - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. + * Copyright 1987, 1988,1990 by the Massachusetts Institute of Technology. * * For copying and distribution information, - * please see the file . + * please see the file . * * This routine generates source code that implements the "E" * operations of the DES. */ -#include +#include #include +#include #include "des_int.h" #include "tables.h" diff --git a/src/lib/crypto/des/make_fp.c b/src/lib/crypto/des/make_fp.c index 0bfb8a56d..22bc33091 100644 --- a/src/lib/crypto/des/make_fp.c +++ b/src/lib/crypto/des/make_fp.c @@ -2,18 +2,18 @@ * $Source$ * $Author$ * - * Copyright 1988 by the Massachusetts Institute of Technology. + * Copyright 1988,1990 by the Massachusetts Institute of Technology. * * For copying and distribution information, - * please see the file . + * please see the file . * * This file contains a generation routine for source code * implementing the final permutation of the DES. */ #include -#include #include +#include #include #include "des_int.h" #include "tables.h" diff --git a/src/lib/crypto/des/make_ip.c b/src/lib/crypto/des/make_ip.c index 40cb7e77d..feb02f71f 100644 --- a/src/lib/crypto/des/make_ip.c +++ b/src/lib/crypto/des/make_ip.c @@ -2,18 +2,18 @@ * $Source$ * $Author$ * - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. + * Copyright 1987, 1988,1990 by the Massachusetts Institute of Technology. * * For copying and distribution information, please see the file - * . + * . * * This routine generates source code implementing the initial * permutation of the DES. */ -#include -#include +#include #include +#include #include "des_int.h" #include "tables.h" diff --git a/src/lib/crypto/des/make_kp.c b/src/lib/crypto/des/make_kp.c index dc337fa24..8863e370b 100644 --- a/src/lib/crypto/des/make_kp.c +++ b/src/lib/crypto/des/make_kp.c @@ -3,10 +3,10 @@ * $Author$ * $Locker$ * - * Copyright 1988 by the Massachusetts Institute of Technology. + * Copyright 1988,1990 by the Massachusetts Institute of Technology. * * For copying and distribution information, please see the file - * . + * . * * This routine calculates an effective Key schedule set of * permutations for des. Beginning with the pre-defined key schedule @@ -16,15 +16,14 @@ * subscripts starting at 0. */ -#include -#include -#include +#include #include +#include #include "des_int.h" #ifndef lint static char rcsid[]= - "$Header$"; + "$Id$"; #endif /* lint */ char *progname; diff --git a/src/lib/crypto/des/make_odd.c b/src/lib/crypto/des/make_odd.c index d44159523..84653ea50 100644 --- a/src/lib/crypto/des/make_odd.c +++ b/src/lib/crypto/des/make_odd.c @@ -2,10 +2,10 @@ * $Source$ * $Author$ * - * Copyright 1988 by the Massachusetts Institute of Technology. + * Copyright 1988,1990 by the Massachusetts Institute of Technology. * * For copying and distribution information, please see - * the file . + * the file . * * This routine generates an odd-parity table for use in key generation. */ diff --git a/src/lib/crypto/des/make_p.c b/src/lib/crypto/des/make_p.c index 65b809000..4f2cc9bf8 100644 --- a/src/lib/crypto/des/make_p.c +++ b/src/lib/crypto/des/make_p.c @@ -2,17 +2,17 @@ * $Source$ * $Author$ * - * Copyright 1985, 1988 by the Massachusetts Institute of Technology. + * Copyright 1985, 1988,1990 by the Massachusetts Institute of Technology. * * For copying and distribution information, please - * see the file . + * see the file . * * This routine generates the P permutation code for the DES. */ #include -#include #include +#include #include "des_int.h" #include "tables.h" diff --git a/src/lib/crypto/des/make_pt.c b/src/lib/crypto/des/make_pt.c index f0c2a10c3..ffe9cb598 100644 --- a/src/lib/crypto/des/make_pt.c +++ b/src/lib/crypto/des/make_pt.c @@ -2,16 +2,16 @@ * $Source$ * $Author$ * - * Copyright 1985, 1988 by the Massachusetts Institute of Technology. + * Copyright 1985, 1988,1990 by the Massachusetts Institute of Technology. * * For copying and distribution information, please - * see the file . + * see the file . * */ -#include -#include +#include #include +#include #include "des_int.h" #include "tables.h" diff --git a/src/lib/crypto/des/make_s.c b/src/lib/crypto/des/make_s.c index e4c42caca..342b4c873 100644 --- a/src/lib/crypto/des/make_s.c +++ b/src/lib/crypto/des/make_s.c @@ -2,15 +2,15 @@ * $Source$ * $Author$ * - * Copyright 1985, 1988 by the Massachusetts Institute of Technology. + * Copyright 1985, 1988, 1990 by the Massachusetts Institute of Technology. * * For copying and distribution information, please - * see the file . + * see the file . */ -#include -#include +#include #include +#include #include "des_int.h" #include "s_table.h" diff --git a/src/lib/crypto/des/make_st.c b/src/lib/crypto/des/make_st.c index f267e0607..144f20f0d 100644 --- a/src/lib/crypto/des/make_st.c +++ b/src/lib/crypto/des/make_st.c @@ -2,15 +2,15 @@ * $Source$ * $Author$ * - * Copyright 1985, 1988 by the Massachusetts Institute of Technology. + * Copyright 1985, 1988, 1990 by the Massachusetts Institute of Technology. * * For copying and distribution information, please - * see the file . + * see the file . */ -#include -#include +#include #include +#include #include "des_int.h" #include "tables.h" diff --git a/src/lib/crypto/des/misc.c b/src/lib/crypto/des/misc.c index c596f82eb..65d8c17da 100644 --- a/src/lib/crypto/des/misc.c +++ b/src/lib/crypto/des/misc.c @@ -2,10 +2,10 @@ * $Source$ * $Author$ * - * Copyright 1988 by the Massachusetts Institute of Technology. + * Copyright 1988,1990 by the Massachusetts Institute of Technology. * * For copying and distribution information, - * please seethe file . + * please seethe file . * * This file contains most of the routines needed by the various * make_foo programs, to account for bit- and byte-ordering on @@ -14,10 +14,9 @@ */ #include -#include -#include #include #include +#include #include "des_int.h" diff --git a/src/lib/crypto/des/new_rn_key.c b/src/lib/crypto/des/new_rn_key.c index 58f98fe72..2f663b53f 100644 --- a/src/lib/crypto/des/new_rn_key.c +++ b/src/lib/crypto/des/new_rn_key.c @@ -2,10 +2,10 @@ * $Source$ * $Author$ * - * Copyright 1988 by the Massachusetts Institute of Technology. + * Copyright 1988,1990 by the Massachusetts Institute of Technology. * * For copying and distribution information, please see the file - * . + * . * * New pseudo-random key generator, using DES encryption to make the * pseudo-random cycle as hard to break as DES. @@ -18,10 +18,10 @@ #if !defined(lint) && !defined(SABER) static char new_rnd_key_c[] = -"$Header$"; +"$Id$"; #endif /* !lint & !SABER */ -#include +#include #include #include "des_int.h" diff --git a/src/lib/crypto/des/process_ky.c b/src/lib/crypto/des/process_ky.c index 5060911f9..b21228c5f 100644 --- a/src/lib/crypto/des/process_ky.c +++ b/src/lib/crypto/des/process_ky.c @@ -5,7 +5,7 @@ * Copyright 1990 by the Massachusetts Institute of Technology. * * For copying and distribution information, please see the file - * . + * . * */ @@ -16,11 +16,8 @@ static char des_prc_key_c[] = #include -#include - #include #include -#include #include "des_int.h" diff --git a/src/lib/crypto/des/random_key.c b/src/lib/crypto/des/random_key.c index 84930d79a..468610fe1 100644 --- a/src/lib/crypto/des/random_key.c +++ b/src/lib/crypto/des/random_key.c @@ -5,7 +5,7 @@ * Copyright 1990 by the Massachusetts Institute of Technology. * * For copying and distribution information, please see the file - * . + * . * */ @@ -16,8 +16,6 @@ static char des_ran_key_c[] = #include -#include - #include #include diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c index d3732fd15..33fa0d858 100644 --- a/src/lib/crypto/des/string2key.c +++ b/src/lib/crypto/des/string2key.c @@ -5,7 +5,7 @@ * Copyright 1990 by the Massachusetts Institute of Technology. * * For copying and distribution information, please see the file - * . + * . * * Wrapper for the V4 libdes for use with kerberos V5. */ @@ -17,10 +17,7 @@ static char des_st2_key_c[] = #include -#include - #include -#include #include #include "des_int.h" diff --git a/src/lib/crypto/des/verify.c b/src/lib/crypto/des/verify.c index a4e6e1b06..eab24fae1 100644 --- a/src/lib/crypto/des/verify.c +++ b/src/lib/crypto/des/verify.c @@ -19,14 +19,11 @@ static char rcsid_verify_c[] = "$Id$"; #endif /*lint*/ -#include -#include -#include -#include +#include #include -#include -#include #include +#include +#include #include extern int errno; diff --git a/src/lib/crypto/des/weak_key.c b/src/lib/crypto/des/weak_key.c index 5aa19d103..e46490af3 100644 --- a/src/lib/crypto/des/weak_key.c +++ b/src/lib/crypto/des/weak_key.c @@ -5,7 +5,7 @@ * Copyright 1989 by the Massachusetts Institute of Technology. * * For copying and distribution information, please see the file - * . + * . * * Under U.S. law, this software may not be exported outside the US * without license from the U.S. Commerce department. @@ -17,9 +17,10 @@ #if !defined(lint) && !defined(SABER) static char weak_key_c[] = -"$Header$"; +"$Id$"; #endif /* !lint & !SABER */ +#include #include #include #include "des_int.h" diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c index 683c34bed..95c92d9f5 100644 --- a/src/lib/kdb/decrypt_key.c +++ b/src/lib/kdb/decrypt_key.c @@ -17,9 +17,7 @@ static char rcsid_decrypt_key_c [] = #include #include -#include #include -#include /* diff --git a/src/lib/kdb/encrypt_key.c b/src/lib/kdb/encrypt_key.c index b60752433..f2c2c5e1b 100644 --- a/src/lib/kdb/encrypt_key.c +++ b/src/lib/kdb/encrypt_key.c @@ -17,9 +17,7 @@ static char rcsid_encrypt_key_c [] = #include #include -#include #include -#include /* * Encrypt a key for storage in the database. "eblock" is used diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c index 809f417f3..43e28f303 100644 --- a/src/lib/kdb/fetch_mkey.c +++ b/src/lib/kdb/fetch_mkey.c @@ -18,15 +18,11 @@ static char rcsid_fetch_mkey_c[] = #include #include -#include -#include #include -#include -#include #include #include +#include /* for MAXPATHLEN */ #include "kdbint.h" -#include /* XXX for MAXPATHLEN */ /* these are available to other funcs, and the pointers may be reassigned */ diff --git a/src/lib/kdb/kdb_dbm.c b/src/lib/kdb/kdb_dbm.c index af0182040..355e1c7eb 100644 --- a/src/lib/kdb/kdb_dbm.c +++ b/src/lib/kdb/kdb_dbm.c @@ -14,24 +14,12 @@ static char rcsid_krb_dbm_c[] = #endif /* lint */ #include - -#include - -#include - -/* XXX these should go into a central system include file */ -#include -#include -#include -#include -#include - #include +#include #include #include -#include - #include +#include #define KRB5_DBM_MAX_RETRY 5 diff --git a/src/lib/kdb/setup_mkey.c b/src/lib/kdb/setup_mkey.c index 451221a9c..182a6ede3 100644 --- a/src/lib/kdb/setup_mkey.c +++ b/src/lib/kdb/setup_mkey.c @@ -19,7 +19,6 @@ static char rcsid_setup_mkey_c[] = #include #include #include -#include /* * Given a key name and a realm name, construct a principal which can be used diff --git a/src/lib/kdb/store_mkey.c b/src/lib/kdb/store_mkey.c index f3f99a4b3..70eb35cc8 100644 --- a/src/lib/kdb/store_mkey.c +++ b/src/lib/kdb/store_mkey.c @@ -19,15 +19,10 @@ static char rcsid_store_mkey_c[] = #include #include #include -#include -#include #include #include #include "kdbint.h" -#include /* XXX for MAXPATHLEN */ -#ifdef unix -#include /* XX for umask prototype */ -#endif +#include /* for MAXPATHLEN */ /* * Put the KDC database master key into a file. If keyfile is NULL, diff --git a/src/lib/kdb/verify_mky.c b/src/lib/kdb/verify_mky.c index 912e99f1f..5b0872bd5 100644 --- a/src/lib/kdb/verify_mky.c +++ b/src/lib/kdb/verify_mky.c @@ -18,9 +18,6 @@ static char rcsid_verify_mky_c[] = #include #include #include -#include -#include -#include #include /* -- 2.26.2