pull up r22094, r22095 from trunk

pull up r22094, r22095 from trunk

 ------------------------------------------------------------------------
 r22095 | hartmans | 2009-03-16 12:50:23 -0400 (Mon, 16 Mar 2009) | 7 lines
 Changed paths:
    M /trunk/src/lib/crypto/Makefile.in
    A /trunk/src/lib/crypto/t_cf2.c
    A /trunk/src/lib/crypto/t_cf2.comments
    A /trunk/src/lib/crypto/t_cf2.expected
    A /trunk/src/lib/crypto/t_cf2.in
    A /trunk/src/lib/crypto/t_prf.comments
    A /trunk/src/lib/crypto/t_prf.expected
    A /trunk/src/lib/crypto/t_prf.in

 ticket: 6421

 Implement test cases for CF2

 Implement a simple program to call KRB-FX-CF2 and print the resulting
 keys.  Add to regression tests.  Also, use the PRF testing application
 to confirm that CF2 generates consistent keys if called by hand.
 ------------------------------------------------------------------------
 r22094 | hartmans | 2009-03-16 12:50:09 -0400 (Mon, 16 Mar 2009) | 6 lines
 Changed paths:
    M /trunk/src/include/krb5/krb5.hin
    M /trunk/src/lib/crypto/Makefile.in
    A /trunk/src/lib/crypto/cf2.c
    M /trunk/src/lib/crypto/etypes.h
    M /trunk/src/lib/crypto/libk5crypto.exports

 ticket: 6421
 Subject: Implement KRB-FX_CF2

 Draft-ietf-krb-wg-preauth-framework defines a function KRB-FX-CF2 that
 combines two keys of arbitrary enctype.  Implement this function as an
 exported API.

ticket: 6421
version_fixed: 1.7

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