From: Tom Yu <tlyu@mit.edu>
Date: Wed, 12 Oct 2005 19:56:41 +0000 (+0000)
Subject: 	* kdc_preauth.c (return_etype_info2): Apply patch from Will
X-Git-Tag: ms-bug-test-20060525~115
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a64c766f13174c995040c6c6d8f7991794c020e0;p=krb5.git

	* kdc_preauth.c (return_etype_info2): Apply patch from Will
	Fiveash to use reply key's enctype, not the long-term key's
	enctype, to avoid some enctype similarity problems.

ticket: 3205
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17420 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index c723ab128..0b197b2fe 100644
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-12  Tom Yu  <tlyu@mit.edu>
+
+	* kdc_preauth.c (return_etype_info2): Apply patch from Will
+	Fiveash to use reply key's enctype, not the long-term key's
+	enctype, to avoid some enctype similarity problems.
+
 2005-07-12  Tom Yu  <tlyu@mit.edu>
 
 	* do_as_req.c (prepare_error_as):
diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c
index da7ddfa56..e2ffe255b 100644
--- a/src/kdc/kdc_preauth.c
+++ b/src/kdc/kdc_preauth.c
@@ -771,7 +771,8 @@ return_etype_info2(krb5_context context, krb5_pa_data * padata,
     }
     entry[0] = NULL;
     entry[1] = NULL;
-    retval = _make_etype_info_entry(context, request, client_key, client_key->key_data_type[0],
+    retval = _make_etype_info_entry(context, request,
+				    client_key, encrypting_key->enctype,
 				    entry, 1);
     if (retval)
 	goto cleanup;