[FFmpeg-cvslog] blowfish: Make the count parameter match the documentation

Samuel Pitoiset git at videolan.org
Thu Jul 5 21:58:37 CEST 2012


ffmpeg | branch: master | Samuel Pitoiset <samuel.pitoiset at gmail.com> | Thu Jul  5 11:33:54 2012 +0200| [e4a7fb3da33d98e3c5bbd4e58faf8b8945a07f9c] | committer: Martin Storsjö

blowfish: 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>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4a7fb3da33d98e3c5bbd4e58faf8b8945a07f9c
---

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

diff --git a/libavutil/blowfish.c b/libavutil/blowfish.c
index 554953e..5df3dfc 100644
--- a/libavutil/blowfish.c
+++ b/libavutil/blowfish.c
@@ -382,7 +382,7 @@ void av_blowfish_crypt(AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
     int i;
 
     if (decrypt) {
-        while (count > 0) {
+        while (count--) {
             v0 = AV_RB32(src);
             v1 = AV_RB32(src + 4);
 
@@ -399,10 +399,9 @@ void av_blowfish_crypt(AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
 
             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];
@@ -423,7 +422,6 @@ void av_blowfish_crypt(AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
 
             src   += 8;
             dst   += 8;
-            count -= 8;
         }
     }
 }



More information about the ffmpeg-cvslog mailing list