[FFmpeg-cvslog] xtea: fix CBC mode when src=dst

[Giorgio Vazzana]

ffmpeg | branch: master | Giorgio Vazzana <mywing81 at gmail.com> | Sun Sep 30 16:00:19 2012 +0200| [8c3ee93be5ef757b12da81d14029f74c78b942ee] | committer: Michael Niedermayer

xtea: fix CBC mode when src=dst

In CBC mode, when src=dst and we are decrypting a block different
from the first one, we need to save the current block of ciphertext
(which will constitute the initialization vector for the next block)
before we overwrite it.

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

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

 libavutil/xtea.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libavutil/xtea.c b/libavutil/xtea.c
index bfc613d..f2dfe99 100644
--- a/libavutil/xtea.c
+++ b/libavutil/xtea.c
@@ -152,15 +152,22 @@ void av_xtea_crypt(AVXTEA *ctx, uint8_t *dst, const uint8_t *src, int count,
                    uint8_t *iv, int decrypt)
 {
     int i;
+    uint8_t iv_tmp[8];
 
     if (decrypt) {
         while (count--) {
+            if (src == dst)
+                memcpy(iv_tmp, src, 8);
+
             xtea_crypt_ecb(ctx, dst, src, decrypt);
 
             if (iv) {
                 for (i = 0; i < 8; i++)
                     dst[i] = dst[i] ^ iv[i];
-                memcpy(iv, src, 8);
+                if (src == dst)
+                    memcpy(iv, iv_tmp, 8);
+                else
+                    memcpy(iv, src, 8);
             }
 
             src   += 8;