* adm.h, adm_proto.h kdb.h : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g

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

4 files changed, 14 insertions, 11 deletions

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 2ad8a09952..be77de42c9 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,6 @@
+Wed Sep 06 14:20:57 1995   Chris Provenzano (proven@mit.edu)
+
+        * adm.h, adm_proto.h kdb.h : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
 
 Tue Sep 05 22:10:34 1995   Chris Provenzano (proven@mit.edu)
 
diff --git a/src/include/krb5/adm.h b/src/include/krb5/adm.h
index b2aa6b580f..1a725c45f4 100644
--- a/src/include/krb5/adm.h
+++ b/src/include/krb5/adm.h
@@ -161,12 +161,12 @@
 #define	KRB5_ADM_KT_PRINCIPAL	0
 #define	KRB5_ADM_KT_TIMESTAMP	1
 #define	KRB5_ADM_KT_VNO		2
-#define	KRB5_ADM_KT_KEY_KEYTYPE	3
+#define	KRB5_ADM_KT_KEY_ENCTYPE	3
 #define	KRB5_ADM_KT_KEY_KEY	4
 #define	KRB5_ADM_KT_NCOMPS	5
 
 typedef struct __krb5_key_salt_tuple {
-    krb5_keytype	ks_keytype;
+    krb5_enctype	ks_enctype;
     krb5_int32		ks_salttype;
 } krb5_key_salt_tuple;
 
@@ -181,7 +181,7 @@ typedef struct __krb5_realm_params {
     krb5_int32		realm_kdc_pport;
     krb5_int32		realm_kdc_sport;
     krb5_int32		realm_kadmind_port;
-    krb5_keytype	realm_keytype;
+    krb5_enctype	realm_enctype;
     krb5_deltat		realm_max_life;
     krb5_deltat		realm_max_rlife;
     krb5_timestamp	realm_expiration;
@@ -190,7 +190,7 @@ typedef struct __krb5_realm_params {
     unsigned int	realm_kdc_pport_valid:1;
     unsigned int	realm_kdc_sport_valid:1;
     unsigned int	realm_kadmind_port_valid:1;
-    unsigned int	realm_keytype_valid:1;
+    unsigned int	realm_enctype_valid:1;
     unsigned int	realm_max_life_valid:1;
     unsigned int	realm_max_rlife_valid:1;
     unsigned int	realm_expiration_valid:1;
diff --git a/src/include/krb5/adm_proto.h b/src/include/krb5/adm_proto.h
index ff97b370ad..64b10c46c2 100644
--- a/src/include/krb5/adm_proto.h
+++ b/src/include/krb5/adm_proto.h
@@ -167,7 +167,7 @@ krb5_error_code krb5_free_realm_params KRB5_PROTOTYPE((krb5_context,
 
 /* str_conv.c */
 krb5_error_code
-krb5_string_to_keytype KRB5_PROTOTYPE((char *, krb5_keytype *));
+krb5_string_to_enctype KRB5_PROTOTYPE((char *, krb5_enctype *));
 krb5_error_code
 krb5_string_to_salttype KRB5_PROTOTYPE((char *, krb5_int32 *));
 krb5_error_code
@@ -182,7 +182,7 @@ krb5_string_to_timestamp KRB5_PROTOTYPE((char *, krb5_timestamp *));
 krb5_error_code
 krb5_string_to_deltat KRB5_PROTOTYPE((char *, krb5_deltat *));
 krb5_error_code
-krb5_keytype_to_string KRB5_PROTOTYPE((krb5_keytype, char *, size_t));
+krb5_enctype_to_string KRB5_PROTOTYPE((krb5_enctype, char *, size_t));
 krb5_error_code
 krb5_salttype_to_string KRB5_PROTOTYPE((krb5_int32, char *, size_t));
 krb5_error_code
@@ -206,7 +206,7 @@ krb5_deltat_to_string KRB5_PROTOTYPE((krb5_deltat, char *, size_t));
 krb5_boolean
 krb5_keysalt_is_present KRB5_PROTOTYPE((krb5_key_salt_tuple *,
 					krb5_int32,
-					krb5_keytype,
+					krb5_enctype,
 					krb5_int32));
 krb5_error_code
 krb5_keysalt_iterate
diff --git a/src/include/krb5/kdb.h b/src/include/krb5/kdb.h
index 3d6c77b467..032c40c67b 100644
--- a/src/include/krb5/kdb.h
+++ b/src/include/krb5/kdb.h
@@ -44,7 +44,7 @@ typedef struct _krb5_tl_data {
  * If this ever changes up the version number and make the arrays be as
  * big as necessary.
  *
- * Currently the first type is the keytype and the second is the salt type.
+ * Currently the first type is the enctype and the second is the salt type.
  */
 typedef struct _krb5_key_data {
     krb5_int16 		  key_data_ver;		/* Version */
@@ -298,10 +298,10 @@ void krb5_dbe_free_contents
 	KRB5_PROTOTYPE((krb5_context,
     		   krb5_db_entry *));
 
-krb5_error_code krb5_dbe_find_keytype
+krb5_error_code krb5_dbe_find_enctype
 	KRB5_PROTOTYPE((krb5_context,
 			krb5_db_entry *,
-			krb5_keytype,
+			krb5_enctype,
 			krb5_int32,
 			krb5_int32,
 			krb5_key_data **));
@@ -346,7 +346,7 @@ krb5_error_code krb5_ser_db_context_init KRB5_PROTOTYPE((krb5_context));
 
 typedef struct _krb5_encrypted_keyblock {
     krb5_magic magic;
-    short keytype;			/* XXX this is SO ugly --- proven */
+    short enctype;			/* XXX this is SO ugly --- proven */
     int length;
     krb5_octet *contents;
 } krb5_encrypted_keyblock;