svn rev #23444: trunk/src/ include/ lib/crypto/builtin/ lib/crypto/builtin/aes/ ...

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23444
Commit By: ghudson
Log Message:
Consolidate the IOV and non-IOV encryption/decryption code paths, and
drop the _iov suffix from most encryption- and decryption-related
functions.  The enc_provider encrypt and decrypt functions take IOVs,
as do the enctype entries in etypes.c, and there are no separate
encrypt_iov or decrypt_iov functions.

aead_provider is gone.  Enctype functions now take pointers to the
enctype entry instead of pointers to the enc/hash/aead providers; this
allows dk_encrypt and dk_decrypt to be polymorphic in the length
function they use now that AES and DES3 can't differentiate by aead
provider.

aes_string_to_key needed to be moved into the krb/ fold for this since
it's an enctype function; it was duplicated between builtin/ and
openssl/ before.  This leaves openssl/aes empty; the build system
currently demands that all modules have the same directory structure,
so the directory and Makefile will stick around for now.

Three separate copies of the derive_random logic are also now
consolidated into one.



Changed Files:
U   trunk/src/include/k5-int.h
U   trunk/src/lib/crypto/builtin/aes/Makefile.in
D   trunk/src/lib/crypto/builtin/aes/aes_s2k.c
D   trunk/src/lib/crypto/builtin/aes/aes_s2k.h
U   trunk/src/lib/crypto/builtin/aes/deps
U   trunk/src/lib/crypto/builtin/deps
U   trunk/src/lib/crypto/builtin/des/Makefile.in
U   trunk/src/lib/crypto/builtin/des/d3_aead.c
D   trunk/src/lib/crypto/builtin/des/d3_cbc.c
U   trunk/src/lib/crypto/builtin/des/deps
U   trunk/src/lib/crypto/builtin/des/des_int.h
U   trunk/src/lib/crypto/builtin/des/f_aead.c
U   trunk/src/lib/crypto/builtin/des/f_cbc.c
U   trunk/src/lib/crypto/builtin/enc_provider/aes.c
U   trunk/src/lib/crypto/builtin/enc_provider/deps
U   trunk/src/lib/crypto/builtin/enc_provider/des.c
U   trunk/src/lib/crypto/builtin/enc_provider/des3.c
U   trunk/src/lib/crypto/builtin/enc_provider/rc4.c
U   trunk/src/lib/crypto/crypto_tests/aes-test.c
U   trunk/src/lib/crypto/crypto_tests/t_cts.c
U   trunk/src/lib/crypto/krb/aead.c
U   trunk/src/lib/crypto/krb/aead.h
U   trunk/src/lib/crypto/krb/arcfour/arcfour.c
U   trunk/src/lib/crypto/krb/arcfour/arcfour.h
U   trunk/src/lib/crypto/krb/arcfour/arcfour_aead.c
U   trunk/src/lib/crypto/krb/arcfour/arcfour_s2k.c
U   trunk/src/lib/crypto/krb/arcfour/deps
U   trunk/src/lib/crypto/krb/combine_keys.c
U   trunk/src/lib/crypto/krb/crypto_length.c
U   trunk/src/lib/crypto/krb/decrypt.c
U   trunk/src/lib/crypto/krb/decrypt_iov.c
U   trunk/src/lib/crypto/krb/deps
U   trunk/src/lib/crypto/krb/dk/Makefile.in
U   trunk/src/lib/crypto/krb/dk/deps
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
D   trunk/src/lib/crypto/krb/dk/dk_decrypt.c
D   trunk/src/lib/crypto/krb/dk/dk_encrypt.c
U   trunk/src/lib/crypto/krb/dk/stringtokey.c
U   trunk/src/lib/crypto/krb/encrypt.c
U   trunk/src/lib/crypto/krb/encrypt_iov.c
U   trunk/src/lib/crypto/krb/encrypt_length.c
U   trunk/src/lib/crypto/krb/etypes.c
U   trunk/src/lib/crypto/krb/etypes.h
U   trunk/src/lib/crypto/krb/keyhash_provider/Makefile.in
U   trunk/src/lib/crypto/krb/keyhash_provider/deps
U   trunk/src/lib/crypto/krb/keyhash_provider/k5_md4des.c
U   trunk/src/lib/crypto/krb/keyhash_provider/k5_md5des.c
U   trunk/src/lib/crypto/krb/old/Makefile.in
U   trunk/src/lib/crypto/krb/old/deps
U   trunk/src/lib/crypto/krb/old/des_stringtokey.c
U   trunk/src/lib/crypto/krb/old/old.h
U   trunk/src/lib/crypto/krb/old/old_aead.c
D   trunk/src/lib/crypto/krb/old/old_decrypt.c
D   trunk/src/lib/crypto/krb/old/old_encrypt.c
U   trunk/src/lib/crypto/krb/prf/deps
U   trunk/src/lib/crypto/krb/prf/des_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/prf/rc4_prf.c
U   trunk/src/lib/crypto/krb/prf.c
U   trunk/src/lib/crypto/krb/raw/Makefile.in
U   trunk/src/lib/crypto/krb/raw/deps
U   trunk/src/lib/crypto/krb/raw/raw.h
U   trunk/src/lib/crypto/krb/raw/raw_aead.c
D   trunk/src/lib/crypto/krb/raw/raw_decrypt.c
D   trunk/src/lib/crypto/krb/raw/raw_encrypt.c
U   trunk/src/lib/crypto/krb/string_to_key.c
U   trunk/src/lib/crypto/krb/yarrow/ycipher.c
U   trunk/src/lib/crypto/openssl/Makefile.in
U   trunk/src/lib/crypto/openssl/aes/Makefile.in
D   trunk/src/lib/crypto/openssl/aes/aes_s2k.c
D   trunk/src/lib/crypto/openssl/aes/aes_s2k.h
U   trunk/src/lib/crypto/openssl/aes/deps
U   trunk/src/lib/crypto/openssl/deps
U   trunk/src/lib/crypto/openssl/enc_provider/aes.c
U   trunk/src/lib/crypto/openssl/enc_provider/deps
U   trunk/src/lib/crypto/openssl/enc_provider/des.c
U   trunk/src/lib/crypto/openssl/enc_provider/des3.c
U   trunk/src/lib/crypto/openssl/enc_provider/rc4.c
U   trunk/src/lib/crypto/openssl/sha1/Makefile.in
Diff larger than 5000 lines; suppressing.