Ticket History #6822: Implement Camellia-CTS-CMAC instead of Camellia-CCM

Replace the Camellia-CCM enctypes with Camellia-CTS-CMAC. Still not
compiled in by default since we don't have enctype assignments yet.


https://github.com/krb5/krb5/commit/41acda8ebd3517c3d0f2184c09741cd10d061182
Commit By: ghudson
Revision: 24524
Changed Files:
U trunk/src/include/k5-int.h
U trunk/src/lib/crypto/builtin/camellia/camellia-gen.c
U trunk/src/lib/crypto/builtin/camellia/camellia.c
U trunk/src/lib/crypto/builtin/enc_provider/Makefile.in
A trunk/src/lib/crypto/builtin/enc_provider/camellia.c
D trunk/src/lib/crypto/builtin/enc_provider/camellia_ctr.c
U trunk/src/lib/crypto/builtin/enc_provider/enc_provider.h
U trunk/src/lib/crypto/crypto_tests/Makefile.in
U trunk/src/lib/crypto/crypto_tests/camellia-test.c
D trunk/src/lib/crypto/crypto_tests/t_camellia_ccm.c
A trunk/src/lib/crypto/crypto_tests/t_cksums.c
U trunk/src/lib/crypto/crypto_tests/t_cmac.c
A trunk/src/lib/crypto/crypto_tests/t_decrypt.c
A trunk/src/lib/crypto/crypto_tests/t_derive.c
U trunk/src/lib/crypto/crypto_tests/t_encrypt.c
U trunk/src/lib/crypto/crypto_tests/t_short.c
U trunk/src/lib/crypto/crypto_tests/t_str2key.c
U trunk/src/lib/crypto/krb/checksum/cmac.c
U trunk/src/lib/crypto/krb/cksumtypes.c
U trunk/src/lib/crypto/krb/dk/Makefile.in
U trunk/src/lib/crypto/krb/dk/checksum_cmac.c
U trunk/src/lib/crypto/krb/dk/derive.c
U trunk/src/lib/crypto/krb/dk/dk.h
D trunk/src/lib/crypto/krb/dk/dk_ccm.c
A trunk/src/lib/crypto/krb/dk/dk_cmac.c
U trunk/src/lib/crypto/krb/dk/stringtokey.c
U trunk/src/lib/crypto/krb/etypes.c
U trunk/src/lib/crypto/krb/prf/cmac_prf.c
U trunk/src/lib/crypto/libk5crypto.exports
U trunk/src/lib/crypto/nss/enc_provider/camellia.c
U trunk/src/lib/crypto/nss/enc_provider/enc_gen.c
U trunk/src/lib/crypto/nss/enc_provider/enc_provider.h
U trunk/src/lib/crypto/nss/nss_gen.h
U trunk/src/lib/crypto/openssl/enc_provider/Makefile.in
A trunk/src/lib/crypto/openssl/enc_provider/camellia.c
D trunk/src/lib/crypto/openssl/enc_provider/camellia_ctr.c
U trunk/src/lib/crypto/openssl/enc_provider/enc_provider.h
U trunk/src/lib/krb5/krb/init_ctx.c
U trunk/src/lib/krb5/krb/t_etypes.c
U trunk/src/tests/dejagnu/config/default.exp
U trunk/src/util/k5test.py
U trunk/src/windows/identity/plugins/krb5/datarep.c
U trunk/src/windows/identity/plugins/krb5/lang/en_us/langres.rc

pull up r24524 from trunk

------------------------------------------------------------------------
r24524 | ghudson | 2010-11-19 19:31:46 -0500 (Fri, 19 Nov 2010) | 8 lines

ticket: 6822
subject: Implement Camellia-CTS-CMAC instead of Camellia-CCM
target_verion: 1.9
tags: pullup

Replace the Camellia-CCM enctypes with Camellia-CTS-CMAC. Still not
compiled in by default since we don't have enctype assignments yet.

https://github.com/krb5/krb5/commit/5d6e04bfb0abad8837ffc466b042348a260e8e35
Commit By: tlyu
Revision: 24543
Changed Files:
U branches/krb5-1-9/src/include/k5-int.h
U branches/krb5-1-9/src/lib/crypto/builtin/camellia/camellia-gen.c
U branches/krb5-1-9/src/lib/crypto/builtin/camellia/camellia.c
U branches/krb5-1-9/src/lib/crypto/builtin/enc_provider/Makefile.in
A branches/krb5-1-9/src/lib/crypto/builtin/enc_provider/camellia.c
D branches/krb5-1-9/src/lib/crypto/builtin/enc_provider/camellia_ctr.c
U branches/krb5-1-9/src/lib/crypto/builtin/enc_provider/enc_provider.h
U branches/krb5-1-9/src/lib/crypto/crypto_tests/Makefile.in
U branches/krb5-1-9/src/lib/crypto/crypto_tests/camellia-test.c
D branches/krb5-1-9/src/lib/crypto/crypto_tests/t_camellia_ccm.c
A branches/krb5-1-9/src/lib/crypto/crypto_tests/t_cksums.c
U branches/krb5-1-9/src/lib/crypto/crypto_tests/t_cmac.c
A branches/krb5-1-9/src/lib/crypto/crypto_tests/t_decrypt.c
A branches/krb5-1-9/src/lib/crypto/crypto_tests/t_derive.c
U branches/krb5-1-9/src/lib/crypto/crypto_tests/t_encrypt.c
U branches/krb5-1-9/src/lib/crypto/crypto_tests/t_short.c
U branches/krb5-1-9/src/lib/crypto/crypto_tests/t_str2key.c
U branches/krb5-1-9/src/lib/crypto/krb/checksum/cmac.c
U branches/krb5-1-9/src/lib/crypto/krb/cksumtypes.c
U branches/krb5-1-9/src/lib/crypto/krb/dk/Makefile.in
U branches/krb5-1-9/src/lib/crypto/krb/dk/checksum_cmac.c
U branches/krb5-1-9/src/lib/crypto/krb/dk/derive.c
U branches/krb5-1-9/src/lib/crypto/krb/dk/dk.h
D branches/krb5-1-9/src/lib/crypto/krb/dk/dk_ccm.c
A branches/krb5-1-9/src/lib/crypto/krb/dk/dk_cmac.c
U branches/krb5-1-9/src/lib/crypto/krb/dk/stringtokey.c
U branches/krb5-1-9/src/lib/crypto/krb/etypes.c
U branches/krb5-1-9/src/lib/crypto/krb/prf/cmac_prf.c
U branches/krb5-1-9/src/lib/crypto/libk5crypto.exports
U branches/krb5-1-9/src/lib/crypto/nss/enc_provider/camellia.c
U branches/krb5-1-9/src/lib/crypto/nss/enc_provider/enc_gen.c
U branches/krb5-1-9/src/lib/crypto/nss/enc_provider/enc_provider.h
U branches/krb5-1-9/src/lib/crypto/nss/nss_gen.h
U branches/krb5-1-9/src/lib/crypto/openssl/enc_provider/Makefile.in
A branches/krb5-1-9/src/lib/crypto/openssl/enc_provider/camellia.c
D branches/krb5-1-9/src/lib/crypto/openssl/enc_provider/camellia_ctr.c
U branches/krb5-1-9/src/lib/crypto/openssl/enc_provider/enc_provider.h
U branches/krb5-1-9/src/lib/krb5/krb/init_ctx.c
U branches/krb5-1-9/src/lib/krb5/krb/t_etypes.c
U branches/krb5-1-9/src/tests/dejagnu/config/default.exp
U branches/krb5-1-9/src/util/k5test.py
U branches/krb5-1-9/src/windows/identity/plugins/krb5/datarep.c
U branches/krb5-1-9/src/windows/identity/plugins/krb5/lang/en_us/langres.rc