commit b9f9860dfea5b1a958f2ceaf8c2a28cc563b8d99
Author: tlyu <tlyu@dc483132-0cff-0310-8789-dd5450dbe970>
Date: Fri Jan 8 23:43:18 2010 +0000
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.
git-svn-id:
svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@23621
dc483132-0cff-0310-8789-dd5450dbe970
src/lib/crypto/krb/dk/stringtokey.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/src/lib/crypto/krb/dk/stringtokey.c b/src/lib/crypto/krb/dk/stringtokey.c
index 9a49187..4c7206c 100644
--- 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)