Reintegrate Macintosh changes while keeping Proven's changes

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

5 files changed, 20 insertions, 20 deletions

diff --git a/src/include/krb5/adm.h b/src/include/krb5/adm.h
index a3ba3e90b..cd461b1d4 100644
--- a/src/include/krb5/adm.h
+++ b/src/include/krb5/adm.h
@@ -163,13 +163,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_ETYPE	4
-#define	KRB5_ADM_KT_KEY_KEY	5
-#define	KRB5_ADM_KT_NCOMPS	6
+#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;
 
@@ -184,7 +183,6 @@ 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;
@@ -194,7 +192,6 @@ 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;
diff --git a/src/include/krb5/adm_proto.h b/src/include/krb5/adm_proto.h
index 842ae5281..64b10c46c 100644
--- a/src/include/krb5/adm_proto.h
+++ b/src/include/krb5/adm_proto.h
@@ -167,12 +167,10 @@ 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
-krb5_string_to_enctype KRB5_PROTOTYPE((char *, krb5_enctype *));
-krb5_error_code
 krb5_string_to_cksumtype KRB5_PROTOTYPE((char *, krb5_cksumtype *));
 krb5_error_code
 krb5_string_to_flags KRB5_PROTOTYPE((char *,
@@ -184,12 +182,10 @@ 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
-krb5_enctype_to_string KRB5_PROTOTYPE((krb5_enctype, char *, size_t));
-krb5_error_code
 krb5_cksumtype_to_string KRB5_PROTOTYPE((krb5_cksumtype, char *, size_t));
 krb5_error_code
 krb5_flags_to_string KRB5_PROTOTYPE((krb5_flags,
@@ -210,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 3d6c77b46..032c40c67 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;
diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog
index f64192f4c..d95657385 100644
--- a/src/include/krb5/stock/ChangeLog
+++ b/src/include/krb5/stock/ChangeLog
@@ -2,6 +2,14 @@
 Mon Jul 17 15:05:42 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* osconf.h - Add DEFAULT_KEYFILE_STUB which puts the stashfile in
 		the kdc directory instead of the root.  Also, change the
+Wed Sep 06 14:20:57 1995   Chris Provenzano (proven@mit.edu)
+
+        * osconf.h : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
+
+Tue Sep 05 22:10:34 1995   Chris Provenzano (proven@mit.edu)
+
+        * osconf.h : Remove krb5_enctype references, and replace with
+                krb5_keytype where appropriate.
 		default ETYPE to DES_CBC_MD5 now that it works.
 
 
diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h
index 5271101d7..0c1353885 100644
--- a/src/include/krb5/stock/osconf.h
+++ b/src/include/krb5/stock/osconf.h
@@ -55,8 +55,7 @@
 #define	DEFAULT_KDC_PROFILE	"@PREFIX/lib/krb5kdc/kdc.prof"
 #define	KDC_PROFILE_ENV		"KRB5_KDC_PROFILE"
 
-#define	DEFAULT_KDC_ETYPE	ETYPE_DES_CBC_MD5
-#define	DEFAULT_KDC_KEYTYPE	KEYTYPE_DES
+#define	DEFAULT_KDC_ENCTYPE	ENCTYPE_DES_CBC_CRC
 #define KDCRCACHE		"dfl:krb5kdc_rcache"
 
 #define KDC_PORTNAME		"kerberos" /* for /etc/services or equiv. */