From: Greg Hudson <ghudson@mit.edu>
Date: Mon, 30 Nov 2009 16:13:50 +0000 (+0000)
Subject: In the des enc_provider decrypt_iov function, count header blocks as
X-Git-Tag: krb5-1.8-alpha1~122
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c54198be3feb7c98aa632be7d4bf56e6002cfffc;p=krb5.git

In the des enc_provider decrypt_iov function, count header blocks as
well as data and padding blocks when checking for correctly padded
input.

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

diff --git a/src/lib/crypto/builtin/enc_provider/des.c b/src/lib/crypto/builtin/enc_provider/des.c
index 6a1ca8db5..e268a20f8 100644
--- a/src/lib/crypto/builtin/enc_provider/des.c
+++ b/src/lib/crypto/builtin/enc_provider/des.c
@@ -101,7 +101,7 @@ k5_des_docrypt_iov(krb5_key key, const krb5_data *ivec,
     for (i = 0; i < num_data; i++) {
         const krb5_crypto_iov *iov = &data[i];
 
-        if (ENCRYPT_DATA_IOV(iov))
+        if (ENCRYPT_IOV(iov))
             input_length += iov->data.length;
     }