From: Chris Provenzano <proven@mit.edu>
Date: Wed, 6 Sep 1995 03:32:21 +0000 (+0000)
Subject:         * decrypt_key.c, fetch_mkey.c, t_kdb.c : Remove krb5_enctype
X-Git-Tag: krb5-1.0-beta6~1176
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5586a10a23ed9f38b328b968319f70a8df5a5933;p=krb5.git

    * decrypt_key.c, fetch_mkey.c, t_kdb.c : Remove krb5_enctype
		references, and replace with krb5_keytype where appropriate

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

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 72ae948b8..194089674 100644
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,4 +1,9 @@
 
+Tue Sep 05 22:10:34 1995   Chris Provenzano (proven@mit.edu)
+
+        * decrypt_key.c, fetch_mkey.c, t_kdb.c : Remove krb5_enctype 
+		references, and replace with krb5_keytype where appropriate
+
 Tue Aug 29 13:34:23 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* kdb_dbm.c - Add routines to support serialization of the database
 		context.  Clean up gcc -Wall complaints.
diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c
index 5fe1ca995..362f832f3 100644
--- a/src/lib/kdb/decrypt_key.c
+++ b/src/lib/kdb/decrypt_key.c
@@ -45,7 +45,6 @@ krb5_dbekd_decrypt_key_data(context, eblock, key_data, keyblock, keysalt)
     krb5_octet		* ptr;
 
     keyblock->magic = KV5M_KEYBLOCK;
-    keyblock->etype = ETYPE_UNKNOWN;
     keyblock->keytype = key_data->key_data_type[0];
 
     /* Decrypt key_data_contents */
diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c
index 1e1293f2b..0577d5eae 100644
--- a/src/lib/kdb/fetch_mkey.c
+++ b/src/lib/kdb/fetch_mkey.c
@@ -100,7 +100,6 @@ krb5_db_fetch_mkey(context, mname, eblock, fromkeyboard, twice, keyfile, salt, k
 
 	retval = 0;
 	key->magic = KV5M_KEYBLOCK;
-	key->etype = eblock->crypto_entry->proto_enctype;
 	(void) strcpy(defkeyfile, DEFAULT_KEYFILE_STUB);
 	(void) strncat(defkeyfile, realm->data,
 		       min(sizeof(defkeyfile)-sizeof(DEFAULT_KEYFILE_STUB)-1,
diff --git a/src/lib/kdb/t_kdb.c b/src/lib/kdb/t_kdb.c
index c53a15913..6d23b43d7 100644
--- a/src/lib/kdb/t_kdb.c
+++ b/src/lib/kdb/t_kdb.c
@@ -531,7 +531,7 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean,
 	goto goodbye;
 
     op = "converting master key";
-    krb5_use_cstype(kcontext, &master_encblock, DEFAULT_KDC_ETYPE);
+    krb5_use_keytype(kcontext, &master_encblock, DEFAULT_KDC_KEYTYPE);
     master_keyblock.keytype = DEFAULT_KDC_KEYTYPE;
     passwd.length = strlen(master_passwd);
     passwd.data = master_passwd;
@@ -586,7 +586,6 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean,
 
 
     stat_kb.keytype = DEFAULT_KDC_KEYTYPE;
-    stat_kb.etype = DEFAULT_KDC_ETYPE;
     stat_kb.length = 8;
     stat_kb.contents = (krb5_octet *) "helpmeee";