[27991] in CVS-changelog-for-Kerberos-V5
krb5 commit: Reset key-generation parameters for each enctype
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Fri Oct 25 19:34:59 2013
Date: Fri, 25 Oct 2013 19:34:54 -0400
From: Benjamin Kaduk <kaduk@MIT.EDU>
Message-Id: <201310252334.r9PNYskt016548@drugstore.mit.edu>
To: cvs-krb5@MIT.EDU
Reply-To: krbdev@MIT.EDU
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@MIT.EDU
https://github.com/krb5/krb5/commit/381cf01afb13ad28de0927de37f8e1d12749bf49
commit 381cf01afb13ad28de0927de37f8e1d12749bf49
Author: Ben Kaduk <kaduk@mit.edu>
Date: Fri Oct 25 14:00:29 2013 -0400
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
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 7b00fcf..5481553 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
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
