From: Greg Hudson Date: Tue, 7 Sep 2010 17:43:08 +0000 (+0000) Subject: Remove Camellia from supported enctype documentation for now since it's X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fcamellia-ccm;p=thirdparty%2Fkrb5.git Remove Camellia from supported enctype documentation for now since it's only conditionally available. Update branch documentation. git-svn-id: svn://anonsvn.mit.edu/krb5/branches/camellia-ccm@24294 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/README.BRANCH b/README.BRANCH index eade598644..471ba764df 100644 --- a/README.BRANCH +++ b/README.BRANCH @@ -7,6 +7,13 @@ This branch incorporates some of the code from 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 @@ crypto/krb additions 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/t_encrypt.c: add camellia enctypes * lib/crypto/crypto_tests/camellia-expect-vt.txt: data file for vector test -* 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_encrypt.c: add camellia enctypes +* 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/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 diff --git a/doc/support-enc.texinfo b/doc/support-enc.texinfo index 09d7b48d89..693f273939 100644 --- a/doc/support-enc.texinfo +++ b/doc/support-enc.texinfo @@ -27,12 +27,6 @@ AES-256 CTS mode with 96-bit SHA-1 HMAC @item aes128-cts-hmac-sha1-96 @itemx aes128-cts AES-128 CTS mode with 96-bit SHA-1 HMAC -@item camellia256-ccm-128 -@itemx camellia256-ccm -Camellia-256 CCM mode -@item camellia128-ccm-128 -@itemx camellia128-ccm -Camellia-128 CCM mode @item arcfour-hmac @itemx rc4-hmac @itemx arcfour-hmac-md5