svn rev #23627: branches/krb5-1-8/src/lib/crypto/builtin/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23627
Commit By: tlyu
Log Message:
ticket: 6630
version_fixed: 1.8
status: resolved

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.


Changed Files:
U   branches/krb5-1-8/src/lib/crypto/builtin/pbkdf2.c
Modified: branches/krb5-1-8/src/lib/crypto/builtin/pbkdf2.c
===================================================================
--- branches/krb5-1-8/src/lib/crypto/builtin/pbkdf2.c	2010-01-11 21:44:13 UTC (rev 23626)
+++ branches/krb5-1-8/src/lib/crypto/builtin/pbkdf2.c	2010-01-11 21:44:18 UTC (rev 23627)
@@ -259,6 +259,7 @@
         keyblock.length = pass->length;
         keyblock.contents = (krb5_octet *) pass->data;
     }
+    keyblock.enctype = ENCTYPE_NULL;
 
     err = krb5_k_create_key(NULL, &keyblock, &key);
     if (err)