pull up r23612 from trunk

 ------------------------------------------------------------------------
 r23612 | epeisach | 2010-01-08 09:54:04 -0500 (Fri, 08 Jan 2010) | 7 lines

 ticket: 6628
 subject: krb5int_dk_string_to_key fails to set enctype
 tags: pullup

 Failure to set the enctype before invoking krb5_k_create_key results in
 potential memory leak.

ticket: 6628
version_fixed: 1.8
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@23621 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/crypto/krb/dk/stringtokey.c b/src/lib/crypto/krb/dk/stringtokey.c
index 9a491879dcb2f028db416cd8caa001f456825e4b..4c7206c2a20961398e0093f8658ff48b6df797bf 100644 (file)
--- a/src/lib/crypto/krb/dk/stringtokey.c
+++ b/src/lib/crypto/krb/dk/stringtokey.c
@@ -72,6 +72,7 @@ krb5int_dk_string_to_key(const struct krb5_keytypes *ktp,
     indata.data = (char *) foldstring;
     foldkeyblock.length = keylength;
     foldkeyblock.contents = foldkeydata;
+    foldkeyblock.enctype = ktp->etype;
 
     ret = enc->make_key(&indata, &foldkeyblock);
     if (ret != 0)