svn rev #24295: trunk/src/ include/ lib/crypto/ lib/crypto/builtin/ lib/crypto/builtin/des/ ...

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24295
Commit By: ghudson
Log Message:
Merge the camellia-ccm branch to trunk.  Since there are no IANA
assignments for Camellia-CCM enctypes or cksumtypes yet, they are
disabled in a default build.  They can be made available by defining
(via CPPFLAGS) local-use enctype numbers for the enctypes and
cksumtypes.



Changed Files:
U   trunk/src/configure.in
U   trunk/src/include/k5-int.h
U   trunk/src/lib/crypto/Makefile.in
U   trunk/src/lib/crypto/builtin/Makefile.in
A   trunk/src/lib/crypto/builtin/camellia/
U   trunk/src/lib/crypto/builtin/des/d3_aead.c
U   trunk/src/lib/crypto/builtin/des/f_aead.c
U   trunk/src/lib/crypto/builtin/enc_provider/Makefile.in
U   trunk/src/lib/crypto/builtin/enc_provider/aes.c
A   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
A   trunk/src/lib/crypto/crypto_tests/camellia-expect-vt.txt
A   trunk/src/lib/crypto/crypto_tests/camellia-test.c
A   trunk/src/lib/crypto/crypto_tests/t_camellia_ccm.c
A   trunk/src/lib/crypto/crypto_tests/t_cmac.c
U   trunk/src/lib/crypto/crypto_tests/t_encrypt.c
U   trunk/src/lib/crypto/crypto_tests/t_short.c
A   trunk/src/lib/crypto/crypto_tests/t_str2key.c
U   trunk/src/lib/crypto/crypto_tests/vectors.c
U   trunk/src/lib/crypto/krb/Makefile.in
U   trunk/src/lib/crypto/krb/aead.c
U   trunk/src/lib/crypto/krb/aead.h
U   trunk/src/lib/crypto/krb/checksum/Makefile.in
A   trunk/src/lib/crypto/krb/checksum/cmac.c
U   trunk/src/lib/crypto/krb/cksumtypes.c
U   trunk/src/lib/crypto/krb/cksumtypes.h
U   trunk/src/lib/crypto/krb/combine_keys.c
U   trunk/src/lib/crypto/krb/dk/Makefile.in
D   trunk/src/lib/crypto/krb/dk/checksum.c
A   trunk/src/lib/crypto/krb/dk/checksum_cmac.c
A   trunk/src/lib/crypto/krb/dk/checksum_hmac.c
U   trunk/src/lib/crypto/krb/dk/derive.c
U   trunk/src/lib/crypto/krb/dk/dk.h
U   trunk/src/lib/crypto/krb/dk/dk_aead.c
A   trunk/src/lib/crypto/krb/dk/dk_ccm.c
U   trunk/src/lib/crypto/krb/dk/stringtokey.c
U   trunk/src/lib/crypto/krb/etypes.c
U   trunk/src/lib/crypto/krb/etypes.h
U   trunk/src/lib/crypto/krb/prf/Makefile.in
A   trunk/src/lib/crypto/krb/prf/cmac_prf.c
U   trunk/src/lib/crypto/krb/prf/dk_prf.c
U   trunk/src/lib/crypto/krb/prf/prf_int.h
U   trunk/src/lib/crypto/krb/rand2key/Makefile.in
A   trunk/src/lib/crypto/krb/rand2key/camellia_rand2key.c
U   trunk/src/lib/crypto/krb/rand2key/rand2key.h
U   trunk/src/lib/crypto/krb/state.c
U   trunk/src/lib/crypto/libk5crypto.exports
A   trunk/src/lib/crypto/openssl/camellia/
U   trunk/src/lib/crypto/openssl/enc_provider/Makefile.in
A   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/collected-client-lib/Makefile.in
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
Diff larger than 5000 lines; suppressing.