From: Tom Yu <tlyu@mit.edu>
Date: Mon, 7 Nov 2011 22:35:35 +0000 (+0000)
Subject: pull up r25418 from trunk
X-Git-Tag: krb5-1.10-alpha2~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=73d37e14883a38e98f2ac0c87c84ba5ea4c8f5fd;p=krb5.git

pull up r25418 from trunk

 ------------------------------------------------------------------------
 r25418 | ghudson | 2011-10-28 11:45:03 -0400 (Fri, 28 Oct 2011) | 9 lines

 ticket: 6994
 subject: Fix intermediate key length in hmac-md5 checksum
 target_version: 1.10
 tags: pullup

 When using hmac-md5, the intermediate key length is the output of the
 hash function (128 bits), not the input key length.  Relevant if the
 input key is not an RC4 key.

ticket: 6994
version_fixed: 1.10
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-10@25449 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/crypto/krb/checksum_hmac_md5.c b/src/lib/crypto/krb/checksum_hmac_md5.c
index 6c5f6175d..8145875ba 100644
--- a/src/lib/crypto/krb/checksum_hmac_md5.c
+++ b/src/lib/crypto/krb/checksum_hmac_md5.c
@@ -59,7 +59,7 @@ krb5_error_code krb5int_hmacmd5_checksum(const struct krb5_cksumtypes *ctp,
         ret = krb5int_hmac(ctp->hash, key, &iov, 1, &ds);
         if (ret)
             goto cleanup;
-        ks.length = key->keyblock.length;
+        ks.length = ds.length;
         ks.contents = (krb5_octet *) ds.data;
         keyblock = &ks;
     } else  /* For md5-hmac, just use the key. */