svn rev #25449: branches/krb5-1-10/src/lib/crypto/krb/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25449
Commit By: tlyu
Log Message:
ticket: 6994
version_fixed: 1.10
status: resolved

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.


Changed Files:
U   branches/krb5-1-10/src/lib/crypto/krb/checksum_hmac_md5.c
Modified: branches/krb5-1-10/src/lib/crypto/krb/checksum_hmac_md5.c
===================================================================
--- branches/krb5-1-10/src/lib/crypto/krb/checksum_hmac_md5.c	2011-11-07 22:35:32 UTC (rev 25448)
+++ branches/krb5-1-10/src/lib/crypto/krb/checksum_hmac_md5.c	2011-11-07 22:35:35 UTC (rev 25449)
@@ -59,7 +59,7 @@
         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. */