rename des.h -> des425.h

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

diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 32747722bbf4dd7a5e796a1bf0bb3c72381ce8e8..034580f7c9051d794ccd3128acfc7759fa520375 100644 (file)
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,5 +1,9 @@
 2001-04-09  Ken Raeburn  <raeburn@mit.edu>
 
+       * des425.h: Renamed from des.h to avoid confusion with the other
+       des.h in the source tree.  Adjust include directives in all other
+       files.
+
        * quad_cksum.c (des_quad_cksum): Add comments.  Force 32-bit
        arithmetic just to be careful.
 

diff --git a/src/lib/des425/cksum.c b/src/lib/des425/cksum.c
index 5f413cf255709ff161d0eac760c16b9106f20920..e435231181fce2900eb5c2db20114d5adb864370 100644 (file)
--- a/src/lib/des425/cksum.c
+++ b/src/lib/des425/cksum.c
@@ -38,7 +38,7 @@
  */
 
 
-#include "des.h"
+#include "des425.h"
 
 /*
  * This routine performs DES cipher-block-chaining checksum operation,

diff --git a/src/lib/des425/des.c b/src/lib/des425/des.c
index 7a4520d6fe69cc4e321b68d29c37b92ebd70e522..2315b434b1f9bb784488efc5d08f6345bb1f9bc8 100644 (file)
--- a/src/lib/des425/des.c
+++ b/src/lib/des425/des.c
@@ -52,7 +52,7 @@
  */
 
 
-#include "des.h"
+#include "des425.h"
 
 KRB5_DLLIMP int KRB5_CALLCONV
 des_ecb_encrypt(clear, cipher, schedule, encrypt)

diff --git a/src/lib/des425/des.h b/src/lib/des425/des425.h
similarity index 98%
rename from src/lib/des425/des.h
rename to src/lib/des425/des425.h
index da91b996c2076fa7e322cefcaa25484ad7fc15da..9ccc82ce8a324f6dec5c922aa6562d948c58cfc8 100644 (file)
--- a/src/lib/des425/des.h
+++ b/src/lib/des425/des425.h
@@ -1,5 +1,5 @@
 /*
- * lib/des425/des.h
+ * lib/des425/des425.h (formerly des.h)
  *
  * Copyright 1991 by the Massachusetts Institute of Technology.
  * All Rights Reserved.

diff --git a/src/lib/des425/enc_dec.c b/src/lib/des425/enc_dec.c
index 8834771e9acc2eda758af27d695dc2f57019431b..0be356075c84c01fea431cd37d243a245775f672 100644 (file)
--- a/src/lib/des425/enc_dec.c
+++ b/src/lib/des425/enc_dec.c
@@ -39,7 +39,7 @@
  */
 
 
-#include "des.h"
+#include "des425.h"
 
 /*
  * This routine performs DES cipher-block-chaining operation, either

diff --git a/src/lib/des425/key_parity.c b/src/lib/des425/key_parity.c
index 6a3cae8dc1654891255ec9f70742de5eb06df397..67480d53fa3903ac9c16ff99ae7bc9847b9544f8 100644 (file)
--- a/src/lib/des425/key_parity.c
+++ b/src/lib/des425/key_parity.c
@@ -35,7 +35,7 @@
  */
 
 
-#include "des.h"
+#include "des425.h"
 
 /*
  * des_fixup_key_parity: Forces odd parity per byte; parity is bits

diff --git a/src/lib/des425/key_sched.c b/src/lib/des425/key_sched.c
index 6f9e24b109c2c5f64bb5d21487248fbf5918d004..b30571c20c97ee4d8675ae05e17a120bb281583b 100644 (file)
--- a/src/lib/des425/key_sched.c
+++ b/src/lib/des425/key_sched.c
@@ -49,7 +49,7 @@
 
 
 #include <stdio.h>
-#include "des.h"
+#include "des425.h"
 
 KRB5_DLLIMP int KRB5_CALLCONV
 des_key_sched(k,schedule)

diff --git a/src/lib/des425/new_rnd_key.c b/src/lib/des425/new_rnd_key.c
index 2e42719b29dbc06716eb3ea622b339e41f036047..2dd6cb103c2382de948b8543cece8dd8ffb58ffc 100644 (file)
--- a/src/lib/des425/new_rnd_key.c
+++ b/src/lib/des425/new_rnd_key.c
@@ -53,7 +53,7 @@
  */
 
 
-#include "des.h"
+#include "des425.h"
 
 /*
  * des_init_random_number_generator:

diff --git a/src/lib/des425/pcbc_encrypt.c b/src/lib/des425/pcbc_encrypt.c
index 3f48fef4e5ad4651c2497689bc18c9d7f838fa05..dd9ad19954c31cbc240004da29eaa749927f85e0 100644 (file)
--- a/src/lib/des425/pcbc_encrypt.c
+++ b/src/lib/des425/pcbc_encrypt.c
@@ -15,7 +15,7 @@
  * des_pcbc_encrypt.c - encrypt a string of characters in error propagation mode
  */
 
-#include "des.h"
+#include "des425.h"
 #include <f_tables.h>
 
 /*

diff --git a/src/lib/des425/quad_cksum.c b/src/lib/des425/quad_cksum.c
index e9340bd5b8aa843ee08a8bc0079be9c04530ee33..2dc51f2c42716e38e91f7d28221a0115630bc50d 100644 (file)
--- a/src/lib/des425/quad_cksum.c
+++ b/src/lib/des425/quad_cksum.c
@@ -106,7 +106,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "des.h"
+#include "des425.h"
 
 /* Definitions for byte swapping */
 

diff --git a/src/lib/des425/random_key.c b/src/lib/des425/random_key.c
index 128a012eddceb0c6cdce68eb5ac42cb6262d7a55..10e1a3c4e17f689b9a4ebe8ef73be0d15e266457 100644 (file)
--- a/src/lib/des425/random_key.c
+++ b/src/lib/des425/random_key.c
@@ -52,7 +52,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include "des.h"
+#include "des425.h"
 
 /* random_key */
 int

diff --git a/src/lib/des425/read_passwd.c b/src/lib/des425/read_passwd.c
index c69d5ffd2d251a08d7c46a5d7a349dd292b04b3e..f09020161713ba4d5cc45f18b85537747c971cd4 100644 (file)
--- a/src/lib/des425/read_passwd.c
+++ b/src/lib/des425/read_passwd.c
@@ -32,7 +32,7 @@
 
 #if !defined(_MSDOS)&&!defined(_WIN32)
 
-#include "des.h"
+#include "des425.h"
 #include <stdio.h>
 #include <errno.h>
 #include <signal.h>

diff --git a/src/lib/des425/str_to_key.c b/src/lib/des425/str_to_key.c
index 44fb143dc4cd7f0c9518492c88b1fe66b7529ad4..7bf75fb8d75cd48fe8f740ab12d2aa653d2ea19c 100644 (file)
--- a/src/lib/des425/str_to_key.c
+++ b/src/lib/des425/str_to_key.c
@@ -43,7 +43,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "des.h"
+#include "des425.h"
 /*   #include "des_internal.h" */
 
 extern int mit_des_debug;

diff --git a/src/lib/des425/string2key.c b/src/lib/des425/string2key.c
index 8756787a1ab629e7a0c79aa72671b34f1a3d5b44..5078d5a958e5c66bc8e798a016702fce2c0cd6cd 100644 (file)
--- a/src/lib/des425/string2key.c
+++ b/src/lib/des425/string2key.c
@@ -29,7 +29,7 @@
  */
 
 
-#include "des.h"
+#include "des425.h"
 #include "des_int.h"
 
 #ifdef DEBUG

diff --git a/src/lib/des425/t_quad.c b/src/lib/des425/t_quad.c
index 106b6743739bdbc9f41b80b881dded724f6260c7..373a5a49e328863dab6dd976260365bc64206f3f 100644 (file)
--- a/src/lib/des425/t_quad.c
+++ b/src/lib/des425/t_quad.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "des.h"
+#include "des425.h"
 
 extern char *errmsg();
 extern int errno;

diff --git a/src/lib/des425/util.c b/src/lib/des425/util.c
index 99b5e866df8d1def53c03d27f36c96a3f31c98f9..6f0330269f9e23cb4002e67a0ef5d8142d939eef 100644 (file)
--- a/src/lib/des425/util.c
+++ b/src/lib/des425/util.c
@@ -13,7 +13,7 @@
 
 /* Application include files */
 #include "k5-int.h"
-#include "des.h"
+#include "des425.h"
 
 void des_cblock_print_file(x, fp)
     des_cblock *x;

diff --git a/src/lib/des425/verify.c b/src/lib/des425/verify.c
index bff3c47dad134530f608fbd57e7f18552a930cea..abce4584979adc324897c03011522aa8a0729298 100644 (file)
--- a/src/lib/des425/verify.c
+++ b/src/lib/des425/verify.c
@@ -34,7 +34,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "./des.h"
+#include "des425.h"
 
 extern char *errmsg();
 extern int errno;

diff --git a/src/lib/des425/weak_key.c b/src/lib/des425/weak_key.c
index 948451db5801808de9f1fa4dcb4a36f37e875095..6ef232ee05ec4b535af208d56f5a9316b5033ba3 100644 (file)
--- a/src/lib/des425/weak_key.c
+++ b/src/lib/des425/weak_key.c
@@ -33,7 +33,7 @@
  */
 
 
-#include "des.h"
+#include "des425.h"
 
 /*
  * mit_des_is_weak_key: returns true iff key is a [semi-]weak des key.