* svr_principal.c (kadm5_decrypt_key): For now, coerce enctype of

	output keyblock in case we got a match on a similar enctype.

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

diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index df297ffdf07b5d602c2f8d4d2b5e588f877872ec..d9a7ee7d91f2f718750b4cfac558b63a6ca0d4c7 100644 (file)
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-22  Tom Yu  <tlyu@mit.edu>
+
+       * svr_principal.c (kadm5_decrypt_key): For now, coerce enctype of
+       output keyblock in case we got a match on a similar enctype.
+
 2001-10-16  Mitchell Berger  <mitchb@mit.edu>
            Matt Crawford  <crawdad@fnal.gov>
 

diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
index 933d3c1f7745e2802439674383a082c5c3113e0b..1586bc5b4ca922e07ba61c204667e7b56392bebc 100644 (file)
--- a/src/lib/kadm5/srv/svr_principal.c
+++ b/src/lib/kadm5/srv/svr_principal.c
@@ -1767,6 +1767,13 @@ kadm5_ret_t kadm5_decrypt_key(void *server_handle,
                                           keyblock, keysalt)))
         return ret;
 
+    /*
+     * Coerce the enctype of the output keyblock in case we got an
+     * inexact match on the enctype; this behavior will go away when
+     * the key storage architecture gets redesigned for 1.3.
+     */
+    keyblock->enctype = ktype;
+
     if (kvnop)
         *kvnop = key_data->key_data_kvno;