projects / krb5.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 97b6d19) | patch
Merge the camellia-ccm branch to trunk. Since there are no IANA
authorGreg Hudson <ghudson@mit.edu>
Tue, 7 Sep 2010 17:54:15 +0000 (17:54 +0000)
committerGreg Hudson <ghudson@mit.edu>
Tue, 7 Sep 2010 17:54:15 +0000 (17:54 +0000)
commit140e24e9149eabe8793d439a7d386c78ecb00fab
treefccb86dad4bd892ba5be6660c91a6222992bdf7ftree | snapshot
parent97b6d19bc89c8eb6754225875890e0f2dbdd929dcommit | diff
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.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24295 dc483132-0cff-0310-8789-dd5450dbe970
63 files changed:
src/configure.in diff | blob | history
src/include/k5-int.h diff | blob | history
src/lib/crypto/Makefile.in diff | blob | history
src/lib/crypto/builtin/Makefile.in diff | blob | history
src/lib/crypto/builtin/camellia/Makefile.in [new file with mode: 0644] blob
src/lib/crypto/builtin/camellia/camellia-gen.c [new file with mode: 0644] blob
src/lib/crypto/builtin/camellia/camellia.c [new file with mode: 0644] blob
src/lib/crypto/builtin/camellia/camellia.h [new file with mode: 0644] blob
src/lib/crypto/builtin/camellia/deps [new file with mode: 0644] blob
src/lib/crypto/builtin/des/d3_aead.c diff | blob | history
src/lib/crypto/builtin/des/f_aead.c diff | blob | history
src/lib/crypto/builtin/enc_provider/Makefile.in diff | blob | history
src/lib/crypto/builtin/enc_provider/aes.c diff | blob | history
src/lib/crypto/builtin/enc_provider/camellia_ctr.c [new file with mode: 0644] blob
src/lib/crypto/builtin/enc_provider/enc_provider.h diff | blob | history
src/lib/crypto/crypto_tests/Makefile.in diff | blob | history
src/lib/crypto/crypto_tests/camellia-expect-vt.txt [new file with mode: 0644] blob
src/lib/crypto/crypto_tests/camellia-test.c [new file with mode: 0644] blob
src/lib/crypto/crypto_tests/t_camellia_ccm.c [new file with mode: 0644] blob
src/lib/crypto/crypto_tests/t_cmac.c [new file with mode: 0644] blob
src/lib/crypto/crypto_tests/t_encrypt.c diff | blob | history
src/lib/crypto/crypto_tests/t_short.c diff | blob | history
src/lib/crypto/crypto_tests/t_str2key.c [new file with mode: 0644] blob
src/lib/crypto/crypto_tests/vectors.c diff | blob | history
src/lib/crypto/krb/Makefile.in diff | blob | history
src/lib/crypto/krb/aead.c diff | blob | history
src/lib/crypto/krb/aead.h diff | blob | history
src/lib/crypto/krb/checksum/Makefile.in diff | blob | history
src/lib/crypto/krb/checksum/cmac.c [new file with mode: 0644] blob
src/lib/crypto/krb/cksumtypes.c diff | blob | history
src/lib/crypto/krb/cksumtypes.h diff | blob | history
src/lib/crypto/krb/combine_keys.c diff | blob | history
src/lib/crypto/krb/dk/Makefile.in diff | blob | history
src/lib/crypto/krb/dk/checksum_cmac.c [new file with mode: 0644] blob
src/lib/crypto/krb/dk/checksum_hmac.c [moved from src/lib/crypto/krb/dk/checksum.c with 97% similarity] diff | blob | history
src/lib/crypto/krb/dk/derive.c diff | blob | history
src/lib/crypto/krb/dk/dk.h diff | blob | history
src/lib/crypto/krb/dk/dk_aead.c diff | blob | history
src/lib/crypto/krb/dk/dk_ccm.c [new file with mode: 0644] blob
src/lib/crypto/krb/dk/stringtokey.c diff | blob | history
src/lib/crypto/krb/etypes.c diff | blob | history
src/lib/crypto/krb/etypes.h diff | blob | history
src/lib/crypto/krb/prf/Makefile.in diff | blob | history
src/lib/crypto/krb/prf/cmac_prf.c [new file with mode: 0644] blob
src/lib/crypto/krb/prf/dk_prf.c diff | blob | history
src/lib/crypto/krb/prf/prf_int.h diff | blob | history
src/lib/crypto/krb/rand2key/Makefile.in diff | blob | history
src/lib/crypto/krb/rand2key/camellia_rand2key.c [new file with mode: 0644] blob
src/lib/crypto/krb/rand2key/rand2key.h diff | blob | history
src/lib/crypto/krb/state.c diff | blob | history
src/lib/crypto/libk5crypto.exports diff | blob | history
src/lib/crypto/openssl/camellia/Makefile.in [new file with mode: 0644] blob
src/lib/crypto/openssl/camellia/deps [new file with mode: 0644] blob
src/lib/crypto/openssl/enc_provider/Makefile.in diff | blob | history
src/lib/crypto/openssl/enc_provider/camellia_ctr.c [new file with mode: 0644] blob
src/lib/crypto/openssl/enc_provider/enc_provider.h diff | blob | history
src/lib/krb5/krb/init_ctx.c diff | blob | history
src/lib/krb5/krb/t_etypes.c diff | blob | history
src/tests/dejagnu/config/default.exp diff | blob | history
src/util/collected-client-lib/Makefile.in diff | blob | history
src/util/k5test.py diff | blob | history
src/windows/identity/plugins/krb5/datarep.c diff | blob | history
src/windows/identity/plugins/krb5/lang/en_us/langres.rc diff | blob | history
MIT implementation of the Kerberos network authentication protocol. This repo may be rebased, so don't base your work on it. Use git://github.com/krb5/krb5 instead.