diff options
author | Greg Hudson <ghudson@mit.edu> | 2012-04-27 21:11:04 +0000 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2012-04-27 21:11:04 +0000 |
commit | bc096a77ffdab283d77c2e0fc1fdd15b9f77eb41 (patch) | |
tree | 9921ea248714b444781e3cb25e12842f55b3d2a8 /src/include/k5-int.h | |
parent | b886919f6478e8c55811c5b790cb5a4a69f9c341 (diff) | |
download | krb5-bc096a77ffdab283d77c2e0fc1fdd15b9f77eb41.tar.gz krb5-bc096a77ffdab283d77c2e0fc1fdd15b9f77eb41.tar.xz krb5-bc096a77ffdab283d77c2e0fc1fdd15b9f77eb41.zip |
Stop using SALT_TYPE_AFS_LENGTH
In krb5_init_creds_ctx and krb5_clpreauth_rock_st, use a boolean to
track whether we're still using the default salt instead of
overloading salt.length. In preauth2.c, process afs3 salt values like
we would in krb5int_des_string_to_key, and set an s2kparams indicator
instead of overloading salt.length. Also use an s2kparams indicator
in kdb_cpw.c's add_key_pwd. Remove the s2k code to handle overloaded
salt lengths, except for a sanity check.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25837 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include/k5-int.h')
-rw-r--r-- | src/include/k5-int.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 752b40efc0..23869c79c5 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -754,6 +754,7 @@ struct krb5_clpreauth_rock_st { krb5_keyblock *as_key; krb5_gic_get_as_key_fct *gak_fct; void **gak_data; + krb5_boolean *default_salt; krb5_data *salt; krb5_data *s2kparams; krb5_principal client; |