|
@@ -21,7 +21,7 @@
|
|
|
|
|
|
union aegis_block {
|
|
|
__le64 words64[AEGIS_BLOCK_SIZE / sizeof(__le64)];
|
|
|
- u32 words32[AEGIS_BLOCK_SIZE / sizeof(u32)];
|
|
|
+ __le32 words32[AEGIS_BLOCK_SIZE / sizeof(__le32)];
|
|
|
u8 bytes[AEGIS_BLOCK_SIZE];
|
|
|
};
|
|
|
|
|
@@ -57,24 +57,22 @@ static void crypto_aegis_aesenc(union aegis_block *dst,
|
|
|
const union aegis_block *src,
|
|
|
const union aegis_block *key)
|
|
|
{
|
|
|
- u32 *d = dst->words32;
|
|
|
const u8 *s = src->bytes;
|
|
|
- const u32 *k = key->words32;
|
|
|
const u32 *t0 = crypto_ft_tab[0];
|
|
|
const u32 *t1 = crypto_ft_tab[1];
|
|
|
const u32 *t2 = crypto_ft_tab[2];
|
|
|
const u32 *t3 = crypto_ft_tab[3];
|
|
|
u32 d0, d1, d2, d3;
|
|
|
|
|
|
- d0 = t0[s[ 0]] ^ t1[s[ 5]] ^ t2[s[10]] ^ t3[s[15]] ^ k[0];
|
|
|
- d1 = t0[s[ 4]] ^ t1[s[ 9]] ^ t2[s[14]] ^ t3[s[ 3]] ^ k[1];
|
|
|
- d2 = t0[s[ 8]] ^ t1[s[13]] ^ t2[s[ 2]] ^ t3[s[ 7]] ^ k[2];
|
|
|
- d3 = t0[s[12]] ^ t1[s[ 1]] ^ t2[s[ 6]] ^ t3[s[11]] ^ k[3];
|
|
|
+ d0 = t0[s[ 0]] ^ t1[s[ 5]] ^ t2[s[10]] ^ t3[s[15]];
|
|
|
+ d1 = t0[s[ 4]] ^ t1[s[ 9]] ^ t2[s[14]] ^ t3[s[ 3]];
|
|
|
+ d2 = t0[s[ 8]] ^ t1[s[13]] ^ t2[s[ 2]] ^ t3[s[ 7]];
|
|
|
+ d3 = t0[s[12]] ^ t1[s[ 1]] ^ t2[s[ 6]] ^ t3[s[11]];
|
|
|
|
|
|
- d[0] = d0;
|
|
|
- d[1] = d1;
|
|
|
- d[2] = d2;
|
|
|
- d[3] = d3;
|
|
|
+ dst->words32[0] = cpu_to_le32(d0) ^ key->words32[0];
|
|
|
+ dst->words32[1] = cpu_to_le32(d1) ^ key->words32[1];
|
|
|
+ dst->words32[2] = cpu_to_le32(d2) ^ key->words32[2];
|
|
|
+ dst->words32[3] = cpu_to_le32(d3) ^ key->words32[3];
|
|
|
}
|
|
|
|
|
|
#endif /* _CRYPTO_AEGIS_H */
|