From: Greg Hudson <ghudson@mit.edu>
Date: Tue, 26 Oct 2010 17:34:41 +0000 (+0000)
Subject: Mark Camellia-CCM code as experimental
X-Git-Tag: krb5-1.10-alpha1~672
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8c080710515d1d1acf6f6e989b6442be85ce7588;p=krb5.git

Mark Camellia-CCM code as experimental

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

ticket: 6811
target_version: 1.9
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24486 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 5f081de36..db879663b 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 */