From: Greg Hudson <ghudson@mit.edu>
Date: Mon, 30 Nov 2009 14:17:06 +0000 (+0000)
Subject: Stream decryption is handled in krb5_k_decrypt_iov; remove some
X-Git-Tag: krb5-1.8-alpha1~124
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb7801ed460acdfde84de1310494e11ea62cd06a;p=krb5.git

Stream decryption is handled in krb5_k_decrypt_iov; remove some
lingering checks in the dk and raw aead providers from before that
was introduced.

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

diff --git a/src/lib/crypto/krb/dk/dk_aead.c b/src/lib/crypto/krb/dk/dk_aead.c
index 1e13fbce4..e5cdd96d2 100644
--- a/src/lib/crypto/krb/dk/dk_aead.c
+++ b/src/lib/crypto/krb/dk/dk_aead.c
@@ -204,12 +204,6 @@ krb5int_dk_decrypt_iov(const struct krb5_aead_provider *aead,
     unsigned int hmacsize = 0;
     unsigned char *cksum = NULL;
 
-    if (krb5int_c_locate_iov(data, num_data,
-                             KRB5_CRYPTO_TYPE_STREAM) != NULL) {
-        return krb5int_c_iov_decrypt_stream(aead, enc, hash, key,
-                                            usage, ivec, data, num_data);
-    }
-
     /* E(Confounder | Plaintext | Pad) | Checksum */
 
     ret = aead->crypto_length(aead, enc, hash, KRB5_CRYPTO_TYPE_PADDING,
diff --git a/src/lib/crypto/krb/raw/raw_aead.c b/src/lib/crypto/krb/raw/raw_aead.c
index a4551b93e..ea91de83a 100644
--- a/src/lib/crypto/krb/raw/raw_aead.c
+++ b/src/lib/crypto/krb/raw/raw_aead.c
@@ -116,12 +116,6 @@ krb5int_raw_decrypt_iov(const struct krb5_aead_provider *aead,
     unsigned int blocksize = 0; /* careful, this is enc block size not confounder len */
     unsigned int cipherlen = 0;
 
-    if (krb5int_c_locate_iov(data, num_data, KRB5_CRYPTO_TYPE_STREAM) != NULL) {
-        return krb5int_c_iov_decrypt_stream(aead, enc, hash, key,
-                                            usage, ivec, data, num_data);
-    }
-
-
     /* E(Confounder | Plaintext | Pad) | Checksum */
 
     ret = aead->crypto_length(aead, enc, hash, KRB5_CRYPTO_TYPE_PADDING, &blocksize);