summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>2010-01-09 16:02:13 +0000
committerEzra Peisach <epeisach@mit.edu>2010-01-09 16:02:13 +0000
commit232fa3ce155c8495a871886c4fb0fc9b6b9e4f1b (patch)
tree224b71b8ae055920868a0f7fdae90bf4fbeffcc5 /src
parent3a812a0d223fbb26dd78e63f9df08bb327b9b992 (diff)
downloadkrb5-232fa3ce155c8495a871886c4fb0fc9b6b9e4f1b.tar.gz
krb5-232fa3ce155c8495a871886c4fb0fc9b6b9e4f1b.tar.xz
krb5-232fa3ce155c8495a871886c4fb0fc9b6b9e4f1b.zip
krb5int_pbkdf2_hmac_sha1 fails to set enctype on keyblock
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 tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23622 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/crypto/builtin/pbkdf2.c1
1 files changed, 1 insertions, 0 deletions
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)