From ac932788c6c4bff0d2c632c1e6517a1bf63bb3a9 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Fri, 14 Oct 2005 22:42:50 +0000 Subject: [PATCH] pull up r17420 from trunk ticket: 3205 version_fixed: 1.4.3 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17429 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kdc/ChangeLog | 6 ++++++ src/kdc/kdc_preauth.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index 2774ff00e..a53b78ca1 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,9 @@ +2005-10-12 Tom Yu + + * 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 * 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; -- 2.26.2