[FFmpeg-cvslog] xtea: fix decryption with --enable-small

Giorgio Vazzana git at videolan.org
Sun Sep 30 20:52:49 CEST 2012


ffmpeg | branch: master | Giorgio Vazzana <mywing81 at gmail.com> | Sun Sep 30 18:47:10 2012 +0200| [a8cb21fd62a1a148d5266324b85810be3c4aca4f] | committer: Michael Niedermayer

xtea: fix decryption with --enable-small

iv decrypt handling code needs to be executed regardless of CONFIG_SMALL

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavutil/xtea.c b/libavutil/xtea.c
index 36b0ce0..1c2bd04 100644
--- a/libavutil/xtea.c
+++ b/libavutil/xtea.c
@@ -94,12 +94,12 @@ static void xtea_crypt_ecb(AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
         DSTEP(0xDAA66D2BU, k1, k2);
         DSTEP(0x3C6EF372U, k2, k1);
         DSTEP(0x9E3779B9U, k3, k0);
-        if(iv){
+#endif
+        if (iv) {
             v0 ^= AV_RB32(iv  );
             v1 ^= AV_RB32(iv+4);
             memcpy(iv, src, 8);
         }
-#endif
     } else {
 #if CONFIG_SMALL
         int i;



More information about the ffmpeg-cvslog mailing list