pull up r24524 from trunk
authorTom Yu <tlyu@mit.edu>
Wed, 1 Dec 2010 02:16:14 +0000 (02:16 +0000)
committerTom Yu <tlyu@mit.edu>
Wed, 1 Dec 2010 02:16:14 +0000 (02:16 +0000)
commit5d6e04bfb0abad8837ffc466b042348a260e8e35
treeebefd38e33874317619452af36fea36ac1994d65
parent48b14852038e9bb3e379d78b5aab84ead6a4f396
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.

ticket: 6822
version_fixed: 1.9
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-9@24543 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