* fetch_mkey.c, kdb_cpw.c, t_kdb.c :

		Remove krb5_enctype from krb5_string_to_key() args.

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

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 934dda6d611ce6a3509dd0af4b98dcc7e38e0bda..587f5882511a798d8ce3ff001badc32b7c52d7e8 100644 (file)
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 09 17:05:57 1995  Chris Provenzano (proven@mit.edu)
+
+        * fetch_mkey.c, kdb_cpw.c, t_kdb.c : 
+               Remove krb5_enctype from krb5_string_to_key() args.
+
 Tue Nov  7 16:35:03 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * kdb_xdr.c (krb5_dbe_search_enctype): Make a more general version

diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c
index 1f2c5e227504c37700d8240cafaa370e8f5e2a55..1197374ef63f9bc92787a4d5f819cb83f936269c 100644 (file)
--- a/src/lib/kdb/fetch_mkey.c
+++ b/src/lib/kdb/fetch_mkey.c
@@ -73,8 +73,7 @@ krb5_db_fetch_mkey(context, mname, eblock, fromkeyboard, twice, keyfile, salt, k
 
        if ((retval = krb5_read_password(context, krb5_mkey_pwd_prompt1,
                                         twice ? krb5_mkey_pwd_prompt2 : 0,
-                                        password,
-                                        &size)))
+                                        password, &size)))
            return(retval);
 
        pwd.data = password;
@@ -84,7 +83,7 @@ krb5_db_fetch_mkey(context, mname, eblock, fromkeyboard, twice, keyfile, salt, k
                if (retval)
                        return retval;
        }
-       retval = krb5_string_to_key(context, eblock, key->enctype, key, &pwd,
+       retval = krb5_string_to_key(context, eblock, key, &pwd,
                                    salt ? salt : &scratch);
        if (!salt)
                krb5_xfree(scratch.data);

diff --git a/src/lib/kdb/kdb_cpw.c b/src/lib/kdb/kdb_cpw.c
index b88a974782457c1ea996458bc1a33632f9558523..fd296fea768d19a948ffef5c95423d3ebfad2cc5 100644 (file)
--- a/src/lib/kdb/kdb_cpw.c
+++ b/src/lib/kdb/kdb_cpw.c
@@ -388,9 +388,8 @@ add_key_pwd(context, master_eblock, ks_tuple, ks_tuple_count, passwd,
 
        pwd.data = passwd;
        pwd.length = strlen(passwd);
-       if (retval = krb5_string_to_key(context, &key_eblock, 
-                                       ks_tuple[i].ks_enctype,
-                                       &key, &pwd, &key_salt.data))
+       if (retval = krb5_string_to_key(context, &key_eblock, &key, &pwd, 
+                                       &key_salt.data))
            return(retval);
 
        if (retval = krb5_dbekd_encrypt_key_data(context, master_eblock, &key,

diff --git a/src/lib/kdb/t_kdb.c b/src/lib/kdb/t_kdb.c
index fb80528c34e3c8ddc522a5c83f422c75d635caec..884b1d645465407ec5effdfbb0929e204c147e07 100644 (file)
--- a/src/lib/kdb/t_kdb.c
+++ b/src/lib/kdb/t_kdb.c
@@ -535,12 +535,8 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean,
     master_keyblock.enctype = DEFAULT_KDC_ENCTYPE;
     passwd.length = strlen(master_passwd);
     passwd.data = master_passwd;
-    if (kret = krb5_string_to_key(kcontext,
-                                 &master_encblock,
-                                 master_keyblock.enctype,
-                                 &master_keyblock,
-                                 &passwd,
-                                 &salt_data))
+    if (kret = krb5_string_to_key(kcontext, &master_encblock, &master_keyblock,
+                                 &passwd, &salt_data))
        goto goodbye;
     /* Clean up */
     free(salt_data.data);