[libav-commits] xtea: Make the count parameter match the documentation

Samuel Pitoiset git at libav.org
Thu Jul 5 11:48:23 CEST 2012


Module: libav
Branch: master
Commit: 983db9b2b4c753507d1cf8427675fca80d598b4c

Author:    Samuel Pitoiset <samuel.pitoiset at gmail.com>
Committer: Martin Storsjö <martin at martin.st>
Date:      Thu Jul  5 11:19:13 2012 +0200

xtea: Make the count parameter match the documentation

Previously it was interpreted as number of bytes, while the
documentation stated that it was the number of 8 byte blocks.
This makes it behave similarly to the existing AES code.

Signed-off-by: Martin Storsjö <martin at martin.st>

---

 libavutil/xtea.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavutil/xtea.c b/libavutil/xtea.c
index 07a66e5..7c3a14c 100644
--- a/libavutil/xtea.c
+++ b/libavutil/xtea.c
@@ -72,7 +72,7 @@ void av_xtea_crypt(AVXTEA *ctx, uint8_t *dst, const uint8_t *src, int count,
     int i;
 
     if (decrypt) {
-        while (count > 0) {
+        while (count--) {
             xtea_crypt_ecb(ctx, dst, src, decrypt);
 
             if (iv) {
@@ -83,10 +83,9 @@ void av_xtea_crypt(AVXTEA *ctx, uint8_t *dst, const uint8_t *src, int count,
 
             src   += 8;
             dst   += 8;
-            count -= 8;
         }
     } else {
-        while (count > 0) {
+        while (count--) {
             if (iv) {
                 for (i = 0; i < 8; i++)
                     dst[i] = src[i] ^ iv[i];
@@ -97,7 +96,6 @@ void av_xtea_crypt(AVXTEA *ctx, uint8_t *dst, const uint8_t *src, int count,
             }
             src   += 8;
             dst   += 8;
-            count -= 8;
         }
     }
 }



More information about the libav-commits mailing list