Implement Camellia-CTS-CMAC instead of Camellia-CCM
authorGreg Hudson <ghudson@mit.edu>
Sat, 20 Nov 2010 00:31:46 +0000 (00:31 +0000)
committerGreg Hudson <ghudson@mit.edu>
Sat, 20 Nov 2010 00:31:46 +0000 (00:31 +0000)
commit41acda8ebd3517c3d0f2184c09741cd10d061182
treedcc9695ff569763cfa96eff1c895d88d27721d12
parent52bae3736c1835b8d7ba6b2e8bda370fe58f044b
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.

ticket: 6822
target_verion: 1.9
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24524 dc483132-0cff-0310-8789-dd5450dbe970
43 files changed:
src/include/k5-int.h
src/lib/crypto/builtin/camellia/camellia-gen.c
src/lib/crypto/builtin/camellia/camellia.c
src/lib/crypto/builtin/enc_provider/Makefile.in
src/lib/crypto/builtin/enc_provider/camellia.c [new file with mode: 0644]
src/lib/crypto/builtin/enc_provider/camellia_ctr.c [deleted file]
src/lib/crypto/builtin/enc_provider/enc_provider.h
src/lib/crypto/crypto_tests/Makefile.in
src/lib/crypto/crypto_tests/camellia-test.c
src/lib/crypto/crypto_tests/t_camellia_ccm.c [deleted file]
src/lib/crypto/crypto_tests/t_cksums.c [new file with mode: 0644]
src/lib/crypto/crypto_tests/t_cmac.c
src/lib/crypto/crypto_tests/t_decrypt.c [new file with mode: 0644]
src/lib/crypto/crypto_tests/t_derive.c [new file with mode: 0644]
src/lib/crypto/crypto_tests/t_encrypt.c
src/lib/crypto/crypto_tests/t_short.c
src/lib/crypto/crypto_tests/t_str2key.c
src/lib/crypto/krb/checksum/cmac.c
src/lib/crypto/krb/cksumtypes.c
src/lib/crypto/krb/dk/Makefile.in
src/lib/crypto/krb/dk/checksum_cmac.c
src/lib/crypto/krb/dk/derive.c
src/lib/crypto/krb/dk/dk.h
src/lib/crypto/krb/dk/dk_ccm.c [deleted file]
src/lib/crypto/krb/dk/dk_cmac.c [new file with mode: 0644]
src/lib/crypto/krb/dk/stringtokey.c
src/lib/crypto/krb/etypes.c
src/lib/crypto/krb/prf/cmac_prf.c
src/lib/crypto/libk5crypto.exports
src/lib/crypto/nss/enc_provider/camellia.c
src/lib/crypto/nss/enc_provider/enc_gen.c
src/lib/crypto/nss/enc_provider/enc_provider.h
src/lib/crypto/nss/nss_gen.h
src/lib/crypto/openssl/enc_provider/Makefile.in
src/lib/crypto/openssl/enc_provider/camellia.c [new file with mode: 0644]
src/lib/crypto/openssl/enc_provider/camellia_ctr.c [deleted file]
src/lib/crypto/openssl/enc_provider/enc_provider.h
src/lib/krb5/krb/init_ctx.c
src/lib/krb5/krb/t_etypes.c
src/tests/dejagnu/config/default.exp
src/util/k5test.py
src/windows/identity/plugins/krb5/datarep.c
src/windows/identity/plugins/krb5/lang/en_us/langres.rc