diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-11-09 22:26:01 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-11-09 22:26:01 +0000 |
| commit | 40afef224a6852357b017eceebd0c0c75e2d19af (patch) | |
| tree | 632c361b9871dcfdc8a81b725d6de55c91db684a /src | |
| parent | f33712e86ca8370634283c90dfb95fe186edc9f4 (diff) | |
| download | krb5-40afef224a6852357b017eceebd0c0c75e2d19af.tar.gz krb5-40afef224a6852357b017eceebd0c0c75e2d19af.tar.xz krb5-40afef224a6852357b017eceebd0c0c75e2d19af.zip | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/kdb/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/kdb/fetch_mkey.c | 5 | ||||
| -rw-r--r-- | src/lib/kdb/kdb_cpw.c | 5 | ||||
| -rw-r--r-- | src/lib/kdb/t_kdb.c | 8 |
4 files changed, 11 insertions, 12 deletions
diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index 934dda6d6..587f58825 100644 --- 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 1f2c5e227..1197374ef 100644 --- 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 b88a97478..fd296fea7 100644 --- 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 fb80528c3..884b1d645 100644 --- 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); |