From 42e9be13b5eb4375cb5d04d9d7710f99735a10fb Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Mon, 11 Jan 2010 21:44:18 +0000 Subject: [PATCH] pull up r23622 from trunk ------------------------------------------------------------------------ r23622 | epeisach | 2010-01-09 11:02:13 -0500 (Sat, 09 Jan 2010) | 8 lines subject: krb5int_pbkdf2_hmac_sha1 fails to set enctype on keyblock ticket: 6630 tags: pullup krb5int_pbkdf2_hmac_sha1 fails to set enctype on a termporary keyblock - resulting in valgrind picking up on a conditional branch w/ unset value. Initialize value. ticket: 6630 version_fixed: 1.8 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@23627 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/builtin/pbkdf2.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/crypto/builtin/pbkdf2.c b/src/lib/crypto/builtin/pbkdf2.c index 7ee07f0c5..31de329c0 100644 --- a/src/lib/crypto/builtin/pbkdf2.c +++ b/src/lib/crypto/builtin/pbkdf2.c @@ -259,6 +259,7 @@ krb5int_pbkdf2_hmac_sha1(const krb5_data *out, unsigned long count, keyblock.length = pass->length; keyblock.contents = (krb5_octet *) pass->data; } + keyblock.enctype = ENCTYPE_NULL; err = krb5_k_create_key(NULL, &keyblock, &key); if (err) -- 2.26.2