summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/kdc/ChangeLog6
-rw-r--r--src/kdc/kdc_preauth.c3
2 files changed, 8 insertions, 1 deletions
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;