Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

Remove Camellia from supported enctype documentation for now since it's

only conditionally available.  Update branch documentation.

git-svn-id: svn:// dc483132-0cff-0310-8789-dd5450dbe970
  • Loading branch information...
commit 136298aed20093a6a1545f7dbe38b9b6aa162b7c 1 parent d042b36
ghudson authored
Showing with 11 additions and 8 deletions.
  1. +11 −2 README.BRANCH
  2. +0 −6 doc/support-enc.texinfo
@@ -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:
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/dejagnu/config/default.exp: Camellia test pass
* lib/crypto/crypto_tests/ 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/ camellia test pass
6 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
Please sign in to comment.
Something went wrong with that request. Please try again.