change names to mit_des_*

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

9 files changed, 66 insertions, 68 deletions

diff --git a/src/lib/crypto/des/cbc_cksum.c b/src/lib/crypto/des/cbc_cksum.c
index 206a9f6e2..655cf3562 100644
--- a/src/lib/crypto/des/cbc_cksum.c
+++ b/src/lib/crypto/des/cbc_cksum.c
@@ -45,11 +45,11 @@ extern int des_key_sched();
 
 	returns: errors
 */
-krb5_error_code des_cbc_checksum(DECLARG(krb5_pointer, in),
-				 DECLARG(size_t, in_length),
-				 DECLARG(krb5_pointer, key),
-				 DECLARG(size_t, key_size),
-				 DECLARG(krb5_checksum *, cksum))
+krb5_error_code mit_des_cbc_checksum(DECLARG(krb5_pointer, in),
+				     DECLARG(size_t, in_length),
+				     DECLARG(krb5_pointer, key),
+				     DECLARG(size_t, key_size),
+				     DECLARG(krb5_checksum *, cksum))
 OLDDECLARG(krb5_pointer, in)
 OLDDECLARG(size_t, in_length)
 OLDDECLARG(krb5_pointer, key)
diff --git a/src/lib/crypto/des/cs_entry.c b/src/lib/crypto/des/cs_entry.c
index a6862f586..00a820b7d 100644
--- a/src/lib/crypto/des/cs_entry.c
+++ b/src/lib/crypto/des/cs_entry.c
@@ -5,56 +5,54 @@
  * Copyright 1990 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please see the file
- * <krb5/mit-copyright.h>.
+ * <krb5/copyright.h>.
  *
- * Wrapper for the V4 libdes for use with kerberos V5.
+ * DES encryption interface file
  */
 
 #if !defined(lint) && !defined(SABER)
-static char des_cs_ent_c[] =
+static char rcsid_des_cs_ent_c[] =
 "$Id$";
 #endif	/* !lint & !SABER */
 
 #include <krb5/copyright.h>
 
-#include <sys/errno.h>
-
 #include <krb5/krb5.h>
 #include <krb5/des.h>
-#include <krb5/ext-proto.h>
 
-extern krb5_error_code encrypt_func PROTOTYPE((const krb5_pointer,
-                                               krb5_pointer,
-                                               const size_t,
-                                               krb5_encrypt_block *,
-					       krb5_pointer));
-extern krb5_error_code decrypt_func PROTOTYPE((const krb5_pointer,
-                                               krb5_pointer,
-                                               const size_t,
-                                               krb5_encrypt_block *,
-					       krb5_pointer));
-extern krb5_error_code process_key PROTOTYPE((krb5_encrypt_block *,
-                                              const krb5_keyblock *));
-extern krb5_error_code finish_key PROTOTYPE((krb5_encrypt_block *));
-extern krb5_error_code string_to_key PROTOTYPE((const krb5_keytype, 
-						krb5_keyblock *,
-                                                const krb5_data *,
-                                                const krb5_principal));
-extern krb5_error_code init_random_key PROTOTYPE((const krb5_keyblock *,
-						  krb5_pointer *));
-extern krb5_error_code finish_random_key PROTOTYPE((krb5_pointer *));
-extern krb5_error_code random_key PROTOTYPE((krb5_pointer,
-					     krb5_keyblock **));
+extern krb5_error_code mit_des_encrypt_func PROTOTYPE((const krb5_pointer,
+						       krb5_pointer,
+						       const size_t,
+						       krb5_encrypt_block *,
+						       krb5_pointer));
+extern krb5_error_code mit_des_decrypt_func PROTOTYPE((const krb5_pointer,
+						       krb5_pointer,
+						       const size_t,
+						       krb5_encrypt_block *,
+						       krb5_pointer));
+extern krb5_error_code mit_des_process_key PROTOTYPE((krb5_encrypt_block *,
+						      const krb5_keyblock *));
+extern krb5_error_code mit_des_finish_key PROTOTYPE((krb5_encrypt_block *));
+extern krb5_error_code mit_des_string_to_key PROTOTYPE((const krb5_keytype, 
+							krb5_keyblock *,
+							const krb5_data *,
+							const krb5_principal));
+extern krb5_error_code mit_des_init_random_key
+    PROTOTYPE((const krb5_keyblock *,
+	       krb5_pointer *));
+extern krb5_error_code mit_des_finish_random_key PROTOTYPE((krb5_pointer *));
+extern krb5_error_code mit_des_random_key PROTOTYPE((krb5_pointer,
+						     krb5_keyblock **));
 
 krb5_cryptosystem_entry mit_des_cryptosystem_entry = {
-    encrypt_func,
-    decrypt_func, 
-    process_key,
-    finish_key,
-    string_to_key,
-    init_random_key,
-    finish_random_key ,
-    random_key,
+    mit_des_encrypt_func,
+    mit_des_decrypt_func, 
+    mit_des_process_key,
+    mit_des_finish_key,
+    mit_des_string_to_key,
+    mit_des_init_random_key,
+    mit_des_finish_random_key,
+    mit_des_random_key,
     sizeof(des_cblock),
     0,
     sizeof(des_cblock),
@@ -66,11 +64,11 @@ krb5_cs_table_entry krb5_des_cst_entry = {
     &mit_des_cryptosystem_entry,
     0
     };
-extern krb5_error_code des_cbc_checksum PROTOTYPE ((krb5_pointer ,
-						    size_t ,
-						    krb5_pointer ,
-						    size_t ,
-						    krb5_checksum * ));
+extern krb5_error_code mit_des_cbc_checksum PROTOTYPE ((krb5_pointer ,
+							size_t ,
+							krb5_pointer ,
+							size_t ,
+							krb5_checksum * ));
 
 
 krb5_checksum_entry des_cbc_cksumtable_entry = {
diff --git a/src/lib/crypto/des/enc_dec.c b/src/lib/crypto/des/enc_dec.c
index b7fa7722c..1fd47b151 100644
--- a/src/lib/crypto/des/enc_dec.c
+++ b/src/lib/crypto/des/enc_dec.c
@@ -56,11 +56,11 @@ extern int des_debug_print();
 	
 	returns: errors
 */
-krb5_error_code encrypt_func(DECLARG(krb5_pointer, in),
-				    DECLARG(krb5_pointer, out),
-				    DECLARG(size_t, size),
-				    DECLARG(krb5_encrypt_block *, key),
-				    DECLARG(krb5_pointer, ivec))
+krb5_error_code mit_des_encrypt_func(DECLARG(krb5_pointer, in),
+				     DECLARG(krb5_pointer, out),
+				     DECLARG(size_t, size),
+				     DECLARG(krb5_encrypt_block *, key),
+				     DECLARG(krb5_pointer, ivec))
 OLDDECLARG(krb5_pointer, in)
 OLDDECLARG(krb5_pointer, out)
 OLDDECLARG(size_t, size)
@@ -97,11 +97,11 @@ OLDDECLARG(krb5_pointer, ivec)
 	returns: errors
 
  */
-krb5_error_code decrypt_func(DECLARG(krb5_pointer, in),
-				    DECLARG(krb5_pointer, out),
-				    DECLARG(size_t, size),
-				    DECLARG(krb5_encrypt_block *, key),
-				    DECLARG(krb5_pointer, ivec))
+krb5_error_code mit_des_decrypt_func(DECLARG(krb5_pointer, in),
+				     DECLARG(krb5_pointer, out),
+				     DECLARG(size_t, size),
+				     DECLARG(krb5_encrypt_block *, key),
+				     DECLARG(krb5_pointer, ivec))
 OLDDECLARG(krb5_pointer, in)
 OLDDECLARG(krb5_pointer, out)
 OLDDECLARG(size_t, size)
diff --git a/src/lib/crypto/des/fin_rndkey.c b/src/lib/crypto/des/fin_rndkey.c
index 1c21884a3..28dfe9e6e 100644
--- a/src/lib/crypto/des/fin_rndkey.c
+++ b/src/lib/crypto/des/fin_rndkey.c
@@ -26,7 +26,7 @@ static char des_fnr_key_c[] =
         free any resources held by "seed" and assigned by init_random_key()
  */
 
-krb5_error_code finish_random_key (DECLARG(krb5_pointer *, seed))
+krb5_error_code mit_des_finish_random_key (DECLARG(krb5_pointer *, seed))
 OLDDECLARG(krb5_pointer *, seed)
 {
     bzero( (char *)*seed, sizeof(des_random_key_seed) );
diff --git a/src/lib/crypto/des/finish_key.c b/src/lib/crypto/des/finish_key.c
index 7a5ec8135..bbaa82010 100644
--- a/src/lib/crypto/des/finish_key.c
+++ b/src/lib/crypto/des/finish_key.c
@@ -30,7 +30,7 @@ static char des_fin_key_c[] =
 	returns: errors
  */
 
-krb5_error_code finish_key (DECLARG(krb5_encrypt_block *,eblock))
+krb5_error_code mit_des_finish_key (DECLARG(krb5_encrypt_block *,eblock))
 OLDDECLARG(krb5_encrypt_block *,eblock)
 {
     bzero((char *)eblock->priv, sizeof(des_key_schedule));
diff --git a/src/lib/crypto/des/init_rkey.c b/src/lib/crypto/des/init_rkey.c
index c311cbd98..21324cf03 100644
--- a/src/lib/crypto/des/init_rkey.c
+++ b/src/lib/crypto/des/init_rkey.c
@@ -33,8 +33,8 @@ extern void des_init_random_number_generator();
         sequence information.
  */
 
-krb5_error_code init_random_key (DECLARG(krb5_keyblock *,seedblock),
-					DECLARG(krb5_pointer *,seed))
+krb5_error_code mit_des_init_random_key (DECLARG(krb5_keyblock *,seedblock),
+					 DECLARG(krb5_pointer *,seed))
 OLDDECLARG(krb5_keyblock *,seedblock)
 OLDDECLARG(krb5_pointer *,seed)
 {
diff --git a/src/lib/crypto/des/process_ky.c b/src/lib/crypto/des/process_ky.c
index be62bebec..51a2087a1 100644
--- a/src/lib/crypto/des/process_ky.c
+++ b/src/lib/crypto/des/process_ky.c
@@ -38,8 +38,8 @@ extern int des_key_sched();
         returns: errors
  */
 
-krb5_error_code process_key (DECLARG(krb5_encrypt_block *, eblock),
-				    DECLARG(krb5_keyblock *,keyblock))
+krb5_error_code mit_des_process_key (DECLARG(krb5_encrypt_block *, eblock),
+				     DECLARG(krb5_keyblock *,keyblock))
 OLDDECLARG(krb5_encrypt_block *, eblock)
 OLDDECLARG(krb5_keyblock *,keyblock)
 {
diff --git a/src/lib/crypto/des/random_key.c b/src/lib/crypto/des/random_key.c
index 5fd407514..76d76d739 100644
--- a/src/lib/crypto/des/random_key.c
+++ b/src/lib/crypto/des/random_key.c
@@ -29,8 +29,8 @@ extern int des_new_random_key();
         filling in the keyblock address in *keyblock
  */
 
-krb5_error_code random_key (DECLARG(krb5_pointer, seed),
-				   DECLARG(krb5_keyblock **, keyblock))
+krb5_error_code mit_des_random_key (DECLARG(krb5_pointer, seed),
+				    DECLARG(krb5_keyblock **, keyblock))
 OLDDECLARG(krb5_pointer, seed)
 OLDDECLARG(krb5_keyblock **, keyblock)
 {
diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c
index 729c5d475..48d6daeb5 100644
--- a/src/lib/crypto/des/string2key.c
+++ b/src/lib/crypto/des/string2key.c
@@ -51,10 +51,10 @@ extern void des_cbc_cksum();
 	returns: errors
  */
 
-krb5_error_code string_to_key (DECLARG(krb5_keytype, keytype),
-				      DECLARG(krb5_keyblock *,keyblock),
-				      DECLARG(krb5_data *,data),
-				      DECLARG(krb5_principal, princ))
+krb5_error_code mit_des_string_to_key (DECLARG(krb5_keytype, keytype),
+				       DECLARG(krb5_keyblock *,keyblock),
+				       DECLARG(krb5_data *,data),
+				       DECLARG(krb5_principal, princ))
 OLDDECLARG(krb5_keytype, keytype)
 OLDDECLARG(krb5_keyblock *,keyblock)
 OLDDECLARG(krb5_data *,data)