diff options
| author | Ben Kaduk <kaduk@mit.edu> | 2013-10-25 14:00:29 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2013-10-25 14:15:12 -0400 |
| commit | 381cf01afb13ad28de0927de37f8e1d12749bf49 (patch) | |
| tree | dfd68b99b579f0ce0fe30c9f0332792755fa1b8b | |
| parent | 0db3c9a631feaf32420d03b76e1d720d64a707a9 (diff) | |
| download | krb5-381cf01afb13ad28de0927de37f8e1d12749bf49.tar.gz krb5-381cf01afb13ad28de0927de37f8e1d12749bf49.tar.xz krb5-381cf01afb13ad28de0927de37f8e1d12749bf49.zip | |
Reset key-generation parameters for each enctype
In add_key_pwd, initialize s2k_params to NULL inside the loop over
enctypes instead of outside the loop, so that if the afs3 salt type
is used it does not contaminate later enctype/salt pairs in the list.
ticket: 7733
tags: pullup
target_version: 1.12
| -rw-r--r-- | src/lib/kdb/kdb_cpw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/kdb/kdb_cpw.c b/src/lib/kdb/kdb_cpw.c index 7b00fcf5f3..5481553692 100644 --- a/src/lib/kdb/kdb_cpw.c +++ b/src/lib/kdb/kdb_cpw.c @@ -389,7 +389,7 @@ add_key_pwd(context, master_key, ks_tuple, ks_tuple_count, passwd, krb5_keysalt key_salt; krb5_keyblock key; krb5_data pwd; - krb5_data afs_params = string2data("\1"), *s2k_params = NULL; + krb5_data afs_params = string2data("\1"), *s2k_params; int i, j, k; krb5_key_data tmp_key_data; krb5_key_data *tptr; @@ -402,6 +402,7 @@ add_key_pwd(context, master_key, ks_tuple, ks_tuple_count, passwd, krb5_boolean similar; similar = 0; + s2k_params = NULL; /* * We could use krb5_keysalt_iterate to replace this loop, or use |