X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2Faes.c;h=797b803b707f913d9e7bb335a4b8c2f18663af06;hb=d4ead7075692a4abdc487fcb422cb9fd5b41a596;hp=f41a61d66766ae4cfb547721a75acea0d82ad5dc;hpb=f38b21315fc72df3914664227ebcece766f01f66;p=silc.git diff --git a/lib/silccrypt/aes.c b/lib/silccrypt/aes.c index f41a61d6..797b803b 100644 --- a/lib/silccrypt/aes.c +++ b/lib/silccrypt/aes.c @@ -453,8 +453,10 @@ AES_RETURN aes_decrypt_key192(const unsigned char *key, aes_decrypt_ctx cx[1]) cx->ks[v(48,(2))] = ss[2] = word_in(key, 2); cx->ks[v(48,(3))] = ss[3] = word_in(key, 3); - cx->ks[v(48,(4))] = ff(ss[4] = word_in(key, 4)); - cx->ks[v(48,(5))] = ff(ss[5] = word_in(key, 5)); + ss[4] = word_in(key, 4); + cx->ks[v(48,(4))] = ff(ss[4]); + ss[5] = word_in(key, 5); + cx->ks[v(48,(5))] = ff(ss[5]); kdf6(cx->ks, 0); kd6(cx->ks, 1); kd6(cx->ks, 2); kd6(cx->ks, 3); kd6(cx->ks, 4); kd6(cx->ks, 5); @@ -519,10 +521,14 @@ AES_RETURN aes_decrypt_key256(const unsigned char *key, aes_decrypt_ctx cx[1]) cx->ks[v(56,(2))] = ss[2] = word_in(key, 2); cx->ks[v(56,(3))] = ss[3] = word_in(key, 3); - cx->ks[v(56,(4))] = ff(ss[4] = word_in(key, 4)); - cx->ks[v(56,(5))] = ff(ss[5] = word_in(key, 5)); - cx->ks[v(56,(6))] = ff(ss[6] = word_in(key, 6)); - cx->ks[v(56,(7))] = ff(ss[7] = word_in(key, 7)); + ss[4] = word_in(key, 4); + cx->ks[v(56,(4))] = ff(ss[4]); + ss[5] = word_in(key, 5); + cx->ks[v(56,(5))] = ff(ss[5]); + ss[6] = word_in(key, 6); + cx->ks[v(56,(6))] = ff(ss[6]); + ss[7] = word_in(key, 7); + cx->ks[v(56,(7))] = ff(ss[7]); kdf8(cx->ks, 0); kd8(cx->ks, 1); kd8(cx->ks, 2); kd8(cx->ks, 3); kd8(cx->ks, 4); kd8(cx->ks, 5);