svn rev #24294: branches/camellia-ccm/ doc/
ghudson@MIT.EDU
ghudson at MIT.EDU
Tue Sep 7 13:43:09 EDT 2010
http://src.mit.edu/fisheye/changelog/krb5/?cs=24294
Commit By: ghudson
Log Message:
Remove Camellia from supported enctype documentation for now since it's
only conditionally available. Update branch documentation.
Changed Files:
U branches/camellia-ccm/README.BRANCH
U branches/camellia-ccm/doc/support-enc.texinfo
Modified: branches/camellia-ccm/README.BRANCH
===================================================================
--- branches/camellia-ccm/README.BRANCH 2010-09-07 17:37:50 UTC (rev 24293)
+++ branches/camellia-ccm/README.BRANCH 2010-09-07 17:43:08 UTC (rev 24294)
@@ -7,6 +7,13 @@
users/lhoward/camellia-ccm, which in turn incorporates code from
users/lhoward/aes-ccm and branches/camellia-cts.
+Because no IANA assignments exist yet for the krb5 enctypes, it is
+necessary at build time to pick local-use enctype and cksumtype values
+to enable this code. This is best done at configure time with
+something like:
+
+ ./configure CPPFLAGS='-DENCTYPE_CAMELLIA128_CCM_128=-66 -DENCTYPE_CAMELLIA256_CCM_128=-67 -DCKSUMTYPE_CMAC_128_CAMELLIA128=-66 -DCKSUMTYPE_CMAC_128_CAMELLIA256=-67'
+
The changes on this branch touch many files. Here is a high-level
overview of the additions:
@@ -111,11 +118,13 @@
Tests
* tests/dejagnu/config/default.exp: Camellia test pass
* lib/crypto/crypto_tests/Makefile.in: add camellia-test and t_cmac
+* lib/crypto/crypto_tests/camellia-expect-vt.txt: data file for vector test
+* lib/crypto/crypto_tests/camellia-test.c: camellia vector test program
* lib/crypto/crypto_tests/t_encrypt.c: add camellia enctypes
-* lib/crypto/crypto_tests/camellia-expect-vt.txt: data file for vector test
+* lib/crypto/crypto_tests/t_camellia_ccm.c: camellia enctype vector tests
* lib/crypto/crypto_tests/t_short.c: add camellia enctypes
-* lib/crypto/crypto_tests/camellia-test.c: camellia vector test program
* lib/crypto/crypto_tests/t_cmac.c: CMAC vector test program
+* lib/crypto/crypto_tests/t_str2key.c: string-to-key vector tests
* lib/crypto/crypto_tests/vectors.c: key derivation call site changes
* lib/krb5/krb/t_etypes.c: test case for enctype parsing of camellia name
* util/k5test.py: camellia test pass
Modified: branches/camellia-ccm/doc/support-enc.texinfo
===================================================================
--- branches/camellia-ccm/doc/support-enc.texinfo 2010-09-07 17:37:50 UTC (rev 24293)
+++ branches/camellia-ccm/doc/support-enc.texinfo 2010-09-07 17:43:08 UTC (rev 24294)
@@ -27,12 +27,6 @@
@item aes128-cts-hmac-sha1-96
@itemx aes128-cts
AES-128 CTS mode with 96-bit SHA-1 HMAC
- at item camellia256-ccm-128
- at itemx camellia256-ccm
-Camellia-256 CCM mode
- at item camellia128-ccm-128
- at itemx camellia128-ccm
-Camellia-128 CCM mode
@item arcfour-hmac
@itemx rc4-hmac
@itemx arcfour-hmac-md5
More information about the cvs-krb5
mailing list