From b209ae460134269eb8ad0bbe6e5db0712a48b48a Mon Sep 17 00:00:00 2001 From: Ben Kaduk Date: Sat, 13 Jul 2013 13:24:12 +0100 Subject: [PATCH] Add support for deriving DES keys to klog.krb5 (cherry-picked from e79102e7918ce5196e870a806879135743ec3abb) Change-Id: Ic83a203b9012620f77316207727a6eeb1c48423e --- src/aklog/klog.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/aklog/klog.c b/src/aklog/klog.c index 3b8573924..181456af5 100644 --- 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); -- 2.39.5