Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: serpent - Fix sparse byte order warnings

This patch fixes the byte order markings in serpent.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: Ard Biesheuvel <ardb@kernel.org> # arm64 big-endian
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

+24 -13
+24 -13
crypto/serpent_generic.c
··· 272 272 u32 *k = ctx->expkey; 273 273 u8 *k8 = (u8 *)k; 274 274 u32 r0, r1, r2, r3, r4; 275 + __le32 *lk; 275 276 int i; 276 277 277 278 /* Copy key, add padding */ ··· 284 283 while (i < SERPENT_MAX_KEY_SIZE) 285 284 k8[i++] = 0; 286 285 286 + lk = (__le32 *)k; 287 + k[0] = le32_to_cpu(lk[0]); 288 + k[1] = le32_to_cpu(lk[1]); 289 + k[2] = le32_to_cpu(lk[2]); 290 + k[3] = le32_to_cpu(lk[3]); 291 + k[4] = le32_to_cpu(lk[4]); 292 + k[5] = le32_to_cpu(lk[5]); 293 + k[6] = le32_to_cpu(lk[6]); 294 + k[7] = le32_to_cpu(lk[7]); 295 + 287 296 /* Expand key using polynomial */ 288 297 289 - r0 = le32_to_cpu(k[3]); 290 - r1 = le32_to_cpu(k[4]); 291 - r2 = le32_to_cpu(k[5]); 292 - r3 = le32_to_cpu(k[6]); 293 - r4 = le32_to_cpu(k[7]); 298 + r0 = k[3]; 299 + r1 = k[4]; 300 + r2 = k[5]; 301 + r3 = k[6]; 302 + r4 = k[7]; 294 303 295 - keyiter(le32_to_cpu(k[0]), r0, r4, r2, 0, 0); 296 - keyiter(le32_to_cpu(k[1]), r1, r0, r3, 1, 1); 297 - keyiter(le32_to_cpu(k[2]), r2, r1, r4, 2, 2); 298 - keyiter(le32_to_cpu(k[3]), r3, r2, r0, 3, 3); 299 - keyiter(le32_to_cpu(k[4]), r4, r3, r1, 4, 4); 300 - keyiter(le32_to_cpu(k[5]), r0, r4, r2, 5, 5); 301 - keyiter(le32_to_cpu(k[6]), r1, r0, r3, 6, 6); 302 - keyiter(le32_to_cpu(k[7]), r2, r1, r4, 7, 7); 304 + keyiter(k[0], r0, r4, r2, 0, 0); 305 + keyiter(k[1], r1, r0, r3, 1, 1); 306 + keyiter(k[2], r2, r1, r4, 2, 2); 307 + keyiter(k[3], r3, r2, r0, 3, 3); 308 + keyiter(k[4], r4, r3, r1, 4, 4); 309 + keyiter(k[5], r0, r4, r2, 5, 5); 310 + keyiter(k[6], r1, r0, r3, 6, 6); 311 + keyiter(k[7], r2, r1, r4, 7, 7); 303 312 304 313 keyiter(k[0], r3, r2, r0, 8, 8); 305 314 keyiter(k[1], r4, r3, r1, 9, 9);