Add support for deriving DES keys to klog.krb5

(cherry-picked from e79102e7918ce5196e870a806879135743ec3abb)

Change-Id: Ic83a203b9012620f77316207727a6eeb1c48423e

diff --git a/src/aklog/klog.c b/src/aklog/klog.c
index 3b8573924a04a4eb3ebe57647e582c3def997fa7..181456af51f8bdf1effacb5d6128f951c36deca9 100644 (file)
--- a/src/aklog/klog.c
+++ b/src/aklog/klog.c
@@ -701,8 +701,15 @@ CommandProc(struct cmd_syndesc *as, char *arock)
        }
        atoken->startTime = afscred->times.starttime;
        atoken->endTime = afscred->times.endtime;
-       memcpy(&atoken->sessionKey, get_cred_keydata(afscred),
-           get_cred_keylen(afscred));
+       if (tkt_DeriveDesKey(get_creds_enctype(afscred),
+                            get_cred_keydata(afscred),
+                            get_cred_keylen(afscred), &atoken->sessionKey)) {
+           afs_com_err(rn, 0,
+                       "Cannot derive DES key from enctype %i of length %u",
+                       get_creds_enctype(afscred),
+                       (unsigned)get_creds_keylen(afscred));
+           KLOGEXIT(1);
+       }
        memcpy(atoken->ticket, enc_part->data,
            atoken->ticketLen = enc_part->length);
        memset(aserver, 0, sizeof *aserver);