svn rev #23385: trunk/src/lib/crypto/krb/ dk/ raw/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23385
Commit By: ghudson
Log Message:
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.



Changed Files:
U   trunk/src/lib/crypto/krb/dk/dk_aead.c
U   trunk/src/lib/crypto/krb/raw/raw_aead.c
Modified: trunk/src/lib/crypto/krb/dk/dk_aead.c
===================================================================
--- trunk/src/lib/crypto/krb/dk/dk_aead.c	2009-11-30 14:14:47 UTC (rev 23384)
+++ trunk/src/lib/crypto/krb/dk/dk_aead.c	2009-11-30 14:17:06 UTC (rev 23385)
@@ -204,12 +204,6 @@
     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,

Modified: trunk/src/lib/crypto/krb/raw/raw_aead.c
===================================================================
--- trunk/src/lib/crypto/krb/raw/raw_aead.c	2009-11-30 14:14:47 UTC (rev 23384)
+++ trunk/src/lib/crypto/krb/raw/raw_aead.c	2009-11-30 14:17:06 UTC (rev 23385)
@@ -116,12 +116,6 @@
     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);