* adm_adm_func.c, adm_fmt_inq.c, adm_funcs.c, adm_process.c,

	* adm_server.c adm_v4_pwd.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g

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

7 files changed, 39 insertions, 35 deletions

diff --git a/src/kadmin.old/server/ChangeLog b/src/kadmin.old/server/ChangeLog
index 819293bd9..79617a0e6 100644
--- a/src/kadmin.old/server/ChangeLog
+++ b/src/kadmin.old/server/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 06 14:20:57 1995   Chris Provenzano (proven@mit.edu)
+
+        * adm_adm_func.c, adm_fmt_inq.c, adm_funcs.c, adm_process.c,
+	* adm_server.c adm_v4_pwd.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
 
 Tue Sep 05 22:10:34 1995   Chris Provenzano (proven@mit.edu)
 
diff --git a/src/kadmin.old/server/adm_adm_func.c b/src/kadmin.old/server/adm_adm_func.c
index 58eff881c..f497a136e 100644
--- a/src/kadmin.old/server/adm_adm_func.c
+++ b/src/kadmin.old/server/adm_adm_func.c
@@ -109,9 +109,9 @@ adm_build_key (context, auth_context, new_passwd, oper_type, entry)
     
     if (oper_type == CHGOPER || oper_type == CH4OPER) {
 	key_data = (krb5_key_data *) NULL;
-	if (krb5_dbe_find_keytype(context,
+	if (krb5_dbe_find_enctype(context,
 				  &entry,
-				  KEYTYPE_DES_CBC_MD5,
+				  ENCTYPE_DES_CBC_MD5,
 				  ((oper_type == CHGOPER) ? 
 				   KRB5_KDB_SALTTYPE_NORMAL : 
 				   KRB5_KDB_SALTTYPE_V4),
@@ -601,30 +601,30 @@ adm_mod_old_key(context, auth_context, cmdname, customer_name)
 	     * We could loop through all the supported key/salt types, but
 	     * we don't have that technology yet.
 	     */
-	    if (!krb5_dbe_find_keytype(context,
+	    if (!krb5_dbe_find_enctype(context,
 				       &entry,
-				       KEYTYPE_DES_CBC_MD5,
+				       ENCTYPE_DES_CBC_MD5,
 				       KRB5_KDB_SALTTYPE_NORMAL,
 				       -1,
 				       &kdata))
 		kdata->key_data_kvno = atoi(tempstr);
-	    if (!krb5_dbe_find_keytype(context,
+	    if (!krb5_dbe_find_enctype(context,
 				       &entry,
-				       KEYTYPE_DES_CBC_CRC,
+				       ENCTYPE_DES_CBC_CRC,
 				       KRB5_KDB_SALTTYPE_V4,
 				       -1,
 				       &kdata))
 		kdata->key_data_kvno = atoi(tempstr);
-	    if (!krb5_dbe_find_keytype(context,
+	    if (!krb5_dbe_find_enctype(context,
 				       &entry,
-				       KEYTYPE_DES_CBC_MD5,
+				       ENCTYPE_DES_CBC_MD5,
 				       KRB5_KDB_SALTTYPE_NOREALM,
 				       -1,
 				       &kdata))
 		kdata->key_data_kvno = atoi(tempstr);
-	    if (!krb5_dbe_find_keytype(context,
+	    if (!krb5_dbe_find_enctype(context,
 				       &entry,
-				       KEYTYPE_DES_CBC_MD5,
+				       ENCTYPE_DES_CBC_MD5,
 				       KRB5_KDB_SALTTYPE_ONLYREALM,
 				       -1,
 				       &kdata))
diff --git a/src/kadmin.old/server/adm_fmt_inq.c b/src/kadmin.old/server/adm_fmt_inq.c
index 3ff13a9c3..9b4ac542f 100644
--- a/src/kadmin.old/server/adm_fmt_inq.c
+++ b/src/kadmin.old/server/adm_fmt_inq.c
@@ -169,9 +169,9 @@ adm_fmt_prt(context, entry, Principal_name, ret_data)
 			entry->max_renewable_life);
     strcat(my_data, thisline);
     pkey = (krb5_key_data *) NULL;
-    if (retval = krb5_dbe_find_keytype(context,
+    if (retval = krb5_dbe_find_enctype(context,
 				       entry,
-				       KEYTYPE_DES_CBC_MD5,
+				       ENCTYPE_DES_CBC_MD5,
 				       KRB5_KDB_SALTTYPE_NORMAL,
 				       -1,
 				       &pkey)) {
diff --git a/src/kadmin.old/server/adm_funcs.c b/src/kadmin.old/server/adm_funcs.c
index 1bf841c9e..f13099364 100644
--- a/src/kadmin.old/server/adm_funcs.c
+++ b/src/kadmin.old/server/adm_funcs.c
@@ -47,8 +47,8 @@ struct saltblock {
 };
 
 static const krb5_key_salt_tuple	keysalts[] = {
-{ KEYTYPE_DES_CBC_MD5, KRB5_KDB_SALTTYPE_NORMAL },
-{ KEYTYPE_DES_CBC_CRC, KRB5_KDB_SALTTYPE_V4 }
+{ ENCTYPE_DES_CBC_MD5, KRB5_KDB_SALTTYPE_NORMAL },
+{ ENCTYPE_DES_CBC_CRC, KRB5_KDB_SALTTYPE_V4 }
 };
 static const krb5_int32			n_keysalts =
 	sizeof(keysalts) / sizeof(keysalts[0]);
diff --git a/src/kadmin.old/server/adm_process.c b/src/kadmin.old/server/adm_process.c
index abab60aba..35d0bc99f 100644
--- a/src/kadmin.old/server/adm_process.c
+++ b/src/kadmin.old/server/adm_process.c
@@ -80,9 +80,9 @@ cpw_keyproc(context, keyblock)
 	}
 
 	/* Find our key */
-	if (retval = krb5_dbe_find_keytype(context,
+	if (retval = krb5_dbe_find_enctype(context,
 					   &cpw_entry,
-					   KEYTYPE_DES_CBC_MD5,
+					   ENCTYPE_DES_CBC_MD5,
 					   -1,
 					   -1,
 					   &kdatap)) {
@@ -208,9 +208,9 @@ process_client(context, prog)
     }
 
     /* Find our key */
-    if (retval = krb5_dbe_find_keytype(context,
+    if (retval = krb5_dbe_find_enctype(context,
 				       &server_entry,
-				       KEYTYPE_DES_CBC_MD5,
+				       ENCTYPE_DES_CBC_MD5,
 				       -1,
 				       -1,
 				       &kdatap)) {
diff --git a/src/kadmin.old/server/adm_server.c b/src/kadmin.old/server/adm_server.c
index 547c40693..c704c39b5 100644
--- a/src/kadmin.old/server/adm_server.c
+++ b/src/kadmin.old/server/adm_server.c
@@ -103,7 +103,7 @@ void
 usage(name)
 char *name;
 {
-    fprintf(stderr, "Usage: %s\t[-a aclfile] [-d dbname] [-k masterkeytype]", 
+    fprintf(stderr, "Usage: %s\t[-a aclfile] [-d dbname] [-k masterenctype]", 
 			name);
     fprintf(stderr, "\n\t[-h] [-m] [-M masterkeyname] [-r realm] [-p port]\n");
     return;
@@ -118,10 +118,10 @@ process_args(context, argc, argv)
     krb5_error_code retval;
     int c;
     krb5_boolean manual = FALSE;
-    int keytypedone = 0;
+    int enctypedone = 0;
     char *mkey_name = 0;
     char *local_realm;
-    krb5_keytype ktype;
+    krb5_enctype ktype;
 
 #ifdef SANDIA
     char input_string[80];
@@ -164,9 +164,9 @@ process_args(context, argc, argv)
 		}
 		break;
 
-	    case 'k':			/* keytype for master key */
-		if (!krb5_string_to_keytype(optarg, &master_keyblock.keytype))
-		    keytypedone++;
+	    case 'k':			/* enctype for master key */
+		if (!krb5_string_to_enctype(optarg, &master_keyblock.enctype))
+		    enctypedone++;
 		else
 		    fprintf(stderr, "%s: %s is an invalid key type\n",
 			    argv[0], optarg);
@@ -214,8 +214,8 @@ process_args(context, argc, argv)
 	mkey_name = KRB5_KDB_M_NAME;
     }
  
-    if (!keytypedone) {
-	master_keyblock.keytype = KEYTYPE_DES_CBC_MD5;
+    if (!enctypedone) {
+	master_keyblock.enctype = ENCTYPE_DES_CBC_MD5;
     }
  
     /* assemble & parse the master key name */
@@ -227,7 +227,7 @@ process_args(context, argc, argv)
 	exit(1);
     }
 
-    krb5_use_keytype(context, &master_encblock, master_keyblock.keytype);
+    krb5_use_enctype(context, &master_encblock, master_keyblock.enctype);
  
     if ((retval = krb5_db_fetch_mkey(context, 
 		master_princ, 
@@ -242,15 +242,15 @@ process_args(context, argc, argv)
     }
 
     /* initialize random key generators */
-    for (ktype = 0; ktype <= krb5_max_keytype; ktype++) {
-	if (krb5_keytype_array[ktype]) {
-		if (retval = (*krb5_keytype_array[ktype]->system->
+    for (ktype = 0; ktype <= krb5_max_enctype; ktype++) {
+	if (krb5_enctype_array[ktype]) {
+		if (retval = (*krb5_enctype_array[ktype]->system->
 				init_random_key)(&master_keyblock,
-				&krb5_keytype_array[ktype]->random_sequence)) {
+				&krb5_enctype_array[ktype]->random_sequence)) {
 			com_err(argv[0], retval, 
 	"while setting up random key generator for ktype %d--ktype disabled", 
 				ktype);
-			krb5_keytype_array[ktype] = 0;
+			krb5_enctype_array[ktype] = 0;
 		}
 	}
     }
@@ -354,9 +354,9 @@ init_db(context, dbname, masterkeyname, masterkeyblock)
 	convert server.key into a real key 
 	(it may be encrypted in the database) 
  */
-    if (retval = krb5_dbe_find_keytype(context,
+    if (retval = krb5_dbe_find_enctype(context,
 				       &server_entry,
-				       KEYTYPE_DES_CBC_MD5,
+				       ENCTYPE_DES_CBC_MD5,
 				       -1,
 				       -1,
 				       &kdatap)) {
diff --git a/src/kadmin.old/server/adm_v4_pwd.c b/src/kadmin.old/server/adm_v4_pwd.c
index 8728092cc..1e48d0e6c 100644
--- a/src/kadmin.old/server/adm_v4_pwd.c
+++ b/src/kadmin.old/server/adm_v4_pwd.c
@@ -357,7 +357,7 @@ int *outlen;
         return(1);
     }  
  
-    v5_keyblock->keytype = KEYTYPE_DES_CBC_MD5;
+    v5_keyblock->enctype = ENCTYPE_DES_CBC_MD5;
     v5_keyblock->length = 8;
     if (!(v5_keyblock->contents = (krb5_octet *) calloc (1,
                 8))) {