Module Name:	krb5
Committed By:	hartmans
Date:		Thu May 15 20:20:47 UTC 2003

Modified Files:
	 krb5/src/lib/crypto/ChangeLog krb5/src/lib/crypto/combine_keys.c
Added Files:

Removed Files:


Log Message
Ticket: 1248
Tags: pullup

Only allow combine_keys to work on des and 3des enctypes.  It is not
supported for rc4 or AES until we implement the crypto framework PRF.


To generate a diff of this commit:
	cvs diff -r5.140 -r5.141 krb5/src/lib/crypto/ChangeLog
	cvs diff -r5.3 -r5.4 krb5/src/lib/crypto/combine_keys.c