svn rev #24500: branches/krb5-1-9/src/include/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24500
Commit By: tlyu
Log Message:
ticket: 6811
version_fixed: 1.9
status: resolved

pull up r24486 from trunk

 ------------------------------------------------------------------------
 r24486 | ghudson | 2010-10-26 13:34:41 -0400 (Tue, 26 Oct 2010) | 8 lines

 ticket: 6811
 subject: Mark Camellia-CCM code as experimental
 target_version: 1.9
 tags: pullup

 Add a comment noting that the Camellia-CCM code in 1.9 is
 experimental.


Changed Files:
U   branches/krb5-1-9/src/include/k5-int.h
Modified: branches/krb5-1-9/src/include/k5-int.h
===================================================================
--- branches/krb5-1-9/src/include/k5-int.h	2010-11-01 20:36:37 UTC (rev 24499)
+++ branches/krb5-1-9/src/include/k5-int.h	2010-11-01 20:36:43 UTC (rev 24500)
@@ -2692,6 +2692,9 @@
  * defined.  When IANA assignments exist, these definitions should move to the
  * appropriate places in krb5.hin and all CAMELLIA_CCM conditional code should
  * be made unconditional.
+ *
+ * The present code is experimental and may not be compatible with the
+ * standardized version.
  */
 #define ENCTYPE_CAMELLIA128_CCM_128 -XXX /* Camellia CCM mode, 128-bit key */
 #define ENCTYPE_CAMELLIA256_CCM_128 -YYY /* Camellia CCM mode, 256-bit key */