From: Tom Yu <tlyu@mit.edu>
Date: Mon, 1 Nov 2010 20:36:43 +0000 (+0000)
Subject: pull up r24486 from trunk
X-Git-Tag: krb5-1.9-beta1~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6748b57b2acfa1d2c665ae1bbef50b1e2819451b;p=krb5.git

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.

ticket: 6811
version_fixed: 1.9
status: resolved

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

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 67f01925a..ff9593b2b 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -2692,6 +2692,9 @@ krb5int_camellia_cbc_mac(krb5_key key, const krb5_crypto_iov *data,
  * 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 */