svn rev #23648: branches/krb5-1-8/src/lib/krb5/krb/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23648
Commit By: tlyu
Log Message:
ticket: 6633
version_fixed: 1.8
status: resolved

pull up r23629 from trunk

 ------------------------------------------------------------------------
 r23629 | ghudson | 2010-01-11 20:07:48 -0500 (Mon, 11 Jan 2010) | 9 lines

 ticket: 6633
 subject: Use keyed checksum type for DES FAST
 target_version: 1.7
 tags: pullup

 DES enctypes have unkeyed mandatory-to-implement checksums.  Since
 FAST requires a keyed checksum, we must pick something else in that
 case.


Changed Files:
U   branches/krb5-1-8/src/lib/krb5/krb/fast.c
Modified: branches/krb5-1-8/src/lib/krb5/krb/fast.c
===================================================================
--- branches/krb5-1-8/src/lib/krb5/krb/fast.c	2010-01-12 04:44:34 UTC (rev 23647)
+++ branches/krb5-1-8/src/lib/krb5/krb/fast.c	2010-01-12 05:03:44 UTC (rev 23648)
@@ -238,6 +238,9 @@
     if (retval == 0)
         retval = krb5int_c_mandatory_cksumtype(context, state->armor_key->enctype,
                                                &cksumtype);
+    /* DES enctypes have unkeyed mandatory checksums; need a keyed one. */
+    if (retval == 0 && !krb5_c_is_keyed_cksum(cksumtype))
+        cksumtype = CKSUMTYPE_RSA_MD5_DES;
     if (retval ==0)
         retval = krb5_c_make_checksum(context, cksumtype, state->armor_key,
                                       KRB5_KEYUSAGE_FAST_REQ_CHKSUM, to_be_checksummed,