Content-Type: text/plain
Content-Disposition: inline
Content-Transfer-Encoding: binary
MIME-Version: 1.0
X-Mailer: MIME-tools 5.427 (Entity 5.427)
From: tlyu@mit.edu
Subject: SVN Commit
RT-Send-CC:
X-RT-Original-Encoding: iso-8859-1
Content-Length: 3172


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