Browse Source

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@gmx.at>
tags/n1.1
Giorgio Vazzana Michael Niedermayer 12 years ago
parent
commit
8c3ee93be5
1 changed files with 8 additions and 1 deletions
  1. +8
    -1
      libavutil/xtea.c

+ 8
- 1
libavutil/xtea.c View File

@@ -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;


Loading…
Cancel
Save