svn rev #23621: branches/krb5-1-8/src/lib/crypto/krb/dk/

[tlyu@MIT.EDU]

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

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.


Changed Files:
U   branches/krb5-1-8/src/lib/crypto/krb/dk/stringtokey.c
Modified: branches/krb5-1-8/src/lib/crypto/krb/dk/stringtokey.c
===================================================================
--- branches/krb5-1-8/src/lib/crypto/krb/dk/stringtokey.c	2010-01-08 23:43:15 UTC (rev 23620)
+++ branches/krb5-1-8/src/lib/crypto/krb/dk/stringtokey.c	2010-01-08 23:43:18 UTC (rev 23621)
@@ -72,6 +72,7 @@
     indata.data = (char *) foldstring;
     foldkeyblock.length = keylength;
     foldkeyblock.contents = foldkeydata;
+    foldkeyblock.enctype = ktp->etype;
 
     ret = enc->make_key(&indata, &foldkeyblock);
     if (ret != 0)