From 497a3e3a049a2289b5db35946ff1203993c101ee Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Tue, 6 Sep 2005 14:49:44 -0700 Subject: [PATCH] --- yaml --- r: 7544 b: refs/heads/master c: fe2d5295a11e2ab2d6f4e7ea074816000b32eba3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/crypto/cipher.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fd2085c3532e..505037d6f93b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b69aee04fbfc027fc4ddaddc809ea8711cef9511 +refs/heads/master: fe2d5295a11e2ab2d6f4e7ea074816000b32eba3 diff --git a/trunk/crypto/cipher.c b/trunk/crypto/cipher.c index 3df47f93c9db..dfd4bcfc5975 100644 --- a/trunk/crypto/cipher.c +++ b/trunk/crypto/cipher.c @@ -191,6 +191,8 @@ static unsigned int cbc_process_encrypt(const struct cipher_desc *desc, u8 *iv = desc->info; unsigned int done = 0; + nbytes -= bsize; + do { xor(iv, src); fn(crypto_tfm_ctx(tfm), dst, iv); @@ -198,7 +200,7 @@ static unsigned int cbc_process_encrypt(const struct cipher_desc *desc, src += bsize; dst += bsize; - } while ((done += bsize) < nbytes); + } while ((done += bsize) <= nbytes); return done; } @@ -219,6 +221,8 @@ static unsigned int cbc_process_decrypt(const struct cipher_desc *desc, u8 *iv = desc->info; unsigned int done = 0; + nbytes -= bsize; + do { u8 *tmp_dst = *dst_p; @@ -230,7 +234,7 @@ static unsigned int cbc_process_decrypt(const struct cipher_desc *desc, src += bsize; dst += bsize; - } while ((done += bsize) < nbytes); + } while ((done += bsize) <= nbytes); return done; } @@ -243,12 +247,14 @@ static unsigned int ecb_process(const struct cipher_desc *desc, u8 *dst, void (*fn)(void *, u8 *, const u8 *) = desc->crfn; unsigned int done = 0; + nbytes -= bsize; + do { fn(crypto_tfm_ctx(tfm), dst, src); src += bsize; dst += bsize; - } while ((done += bsize) < nbytes); + } while ((done += bsize) <= nbytes); return done; }