diff --git a/[refs] b/[refs] index c2124d99f982..fa75c46d5bba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54216bbd76aa394c93a9e92c0a2e3b314391b134 +refs/heads/master: 200429cc63399e99dd2abcdca5088559a911ef2b diff --git a/trunk/arch/x86/crypto/cast5_avx_glue.c b/trunk/arch/x86/crypto/cast5_avx_glue.c index 445aab06387b..e0ea14f9547f 100644 --- a/trunk/arch/x86/crypto/cast5_avx_glue.c +++ b/trunk/arch/x86/crypto/cast5_avx_glue.c @@ -165,7 +165,7 @@ static unsigned int __cbc_encrypt(struct blkcipher_desc *desc, nbytes -= bsize; } while (nbytes >= bsize); - *(u64 *)walk->iv ^= *iv; + *(u64 *)walk->iv = *iv; return nbytes; }