From: Chris Provenzano <proven@mit.edu>
Date: Thu, 9 Nov 1995 22:22:34 +0000 (+0000)
Subject: 	* kdb5_create.c : Remove krb5_enctype from krb5_string_to_key() args
X-Git-Tag: krb5-1.0-beta6~827
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2da89038a5693e9fc3bc60295683a006fe0c7d10;p=krb5.git

	* kdb5_create.c : Remove krb5_enctype from krb5_string_to_key() args

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

diff --git a/src/admin/create/ChangeLog b/src/admin/create/ChangeLog
index 1045e9f98..00ec86e3b 100644
--- a/src/admin/create/ChangeLog
+++ b/src/admin/create/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 09 17:05:57 1995  Chris Provenzano (proven@mit.edu)
+
+	* kdb5_create.c : Remove krb5_enctype from krb5_string_to_key() args.
+
 Wed Oct 18 14:25:29 1995    <tytso@rsts-11.mit.edu>
 
 	* kdb5_create.c (main): Add new option 's' which automatically
diff --git a/src/admin/create/kdb5_create.c b/src/admin/create/kdb5_create.c
index f1733baf1..5ed26eaa2 100644
--- a/src/admin/create/kdb5_create.c
+++ b/src/admin/create/kdb5_create.c
@@ -321,12 +321,9 @@ master key name '%s'\n",
 	com_err(argv[0], retval, "while calculated master key salt");
 	exit(1);
     }
-    retval = krb5_string_to_key(context, &master_encblock, 
-				master_keyblock.enctype, &master_keyblock, 
-				&pwd, &master_salt);
-    if (retval) {
-	com_err(argv[0], retval,
-		"while transforming master key from password");
+    if (retval = krb5_string_to_key(context, &master_encblock, 
+				    &master_keyblock, &pwd, &master_salt)) {
+	com_err(argv[0], retval, "while transforming master key from password");
 	exit(1);
     }
 
@@ -420,10 +417,8 @@ tgt_keysalt_iterate(ksent, ptr)
     krb5_use_enctype(context, &random_encblock, ksent->ks_enctype);
     pwd.data = mkey_password;
     pwd.length = strlen(mkey_password);
-    kret = krb5_string_to_key(context, &random_encblock, 
-				ksent->ks_enctype, &random_keyblock, 
-				&pwd, &master_salt);
-    if (kret)
+    if (kret = krb5_string_to_key(context, &random_encblock, &random_keyblock, 
+			      &pwd, &master_salt))
 	return kret;
     if ((kret = krb5_init_random_key(context, &random_encblock, 
 				       &random_keyblock, &rseed)))