|
@@ -833,7 +833,7 @@ static void mix_column(u8 *in, u8 *out)
|
|
|
u8 add1b[4];
|
|
|
u8 add1bf7[4];
|
|
|
u8 rotl[4];
|
|
|
- u8 swap_halfs[4];
|
|
|
+ u8 swap_halves[4];
|
|
|
u8 andf7[4];
|
|
|
u8 rotr[4];
|
|
|
u8 temp[4];
|
|
@@ -845,10 +845,10 @@ static void mix_column(u8 *in, u8 *out)
|
|
|
else
|
|
|
add1b[i] = 0x00;
|
|
|
}
|
|
|
- swap_halfs[0] = in[2]; /* Swap halves */
|
|
|
- swap_halfs[1] = in[3];
|
|
|
- swap_halfs[2] = in[0];
|
|
|
- swap_halfs[3] = in[1];
|
|
|
+ swap_halves[0] = in[2]; /* Swap halves */
|
|
|
+ swap_halves[1] = in[3];
|
|
|
+ swap_halves[2] = in[0];
|
|
|
+ swap_halves[3] = in[1];
|
|
|
rotl[0] = in[3]; /* Rotate left 8 bits */
|
|
|
rotl[1] = in[0];
|
|
|
rotl[2] = in[1];
|
|
@@ -872,7 +872,7 @@ static void mix_column(u8 *in, u8 *out)
|
|
|
rotr[2] = rotr[3];
|
|
|
rotr[3] = temp[0];
|
|
|
xor_32(add1bf7, rotr, temp);
|
|
|
- xor_32(swap_halfs, rotl, tempb);
|
|
|
+ xor_32(swap_halves, rotl, tempb);
|
|
|
xor_32(temp, tempb, out);
|
|
|
}
|
|
|
|