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.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23444 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 14 insertions, 23 deletions

diff --git a/src/lib/crypto/krb/arcfour/arcfour.h b/src/lib/crypto/krb/arcfour/arcfour.h
index 64193381c..7ec0d77b9 100644
--- a/src/lib/crypto/krb/arcfour/arcfour.h
+++ b/src/lib/crypto/krb/arcfour/arcfour.h
@@ -2,39 +2,30 @@
 #ifndef ARCFOUR_H
 #define ARCFOUR_H
 
-extern void
-krb5int_arcfour_encrypt_length(const struct krb5_enc_provider *,
-                               const struct krb5_hash_provider *,
-                               size_t,
-                               size_t *);
+#include "etypes.h"
 
-extern krb5_error_code
-krb5int_arcfour_encrypt(const struct krb5_enc_provider *,
-                        const struct krb5_hash_provider *,
-                        krb5_key,
-                        krb5_keyusage,
-                        const krb5_data *,
-                        const krb5_data *,
-                        krb5_data *);
+unsigned int
+krb5int_arcfour_crypto_length(const struct krb5_keytypes *ktp,
+                              krb5_cryptotype type);
 
-extern krb5_error_code
-krb5int_arcfour_decrypt(const struct krb5_enc_provider *,
-                        const struct krb5_hash_provider *,
-                        krb5_key,
-                        krb5_keyusage,
-                        const krb5_data *,
-                        const krb5_data *,
-                        krb5_data *);
+krb5_error_code
+krb5int_arcfour_encrypt(const struct krb5_keytypes *ktp, krb5_key key,
+                        krb5_keyusage usage, const krb5_data *ivec,
+                        krb5_crypto_iov *data, size_t num_data);
+
+krb5_error_code
+krb5int_arcfour_decrypt(const struct krb5_keytypes *ktp, krb5_key key,
+                        krb5_keyusage usage, const krb5_data *ivec,
+                        krb5_crypto_iov *data, size_t num_data);
 
 extern krb5_error_code
 krb5int_arcfour_string_to_key(
-    const struct krb5_enc_provider *,
+    const struct krb5_keytypes *,
     const krb5_data *,
     const krb5_data *,
     const krb5_data *,
     krb5_keyblock *);
 
 extern const struct krb5_enc_provider krb5int_enc_arcfour;
-extern const struct krb5_aead_provider krb5int_aead_arcfour;
 
 #endif /* ARCFOUR_H */