aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-12-05 03:38:56 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-05 12:25:20 -0500
commit3c50b3683a8efbf3b4b314209d86aed1a0c44d5b (patch)
tree5d23c057d49ed36426e7a52904fd13ba7f673ea2 /crypto
parent79901a9738d75faba0f08547ff17d676af2f5be3 (diff)
fcrypt endianness misannotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/fcrypt.c88
1 files changed, 44 insertions, 44 deletions
diff --git a/crypto/fcrypt.c b/crypto/fcrypt.c
index d161949fdb94..a32cb68bbc60 100644
--- a/crypto/fcrypt.c
+++ b/crypto/fcrypt.c
@@ -51,7 +51,7 @@
51#define ROUNDS 16 51#define ROUNDS 16
52 52
53struct fcrypt_ctx { 53struct fcrypt_ctx {
54 u32 sched[ROUNDS]; 54 __be32 sched[ROUNDS];
55}; 55};
56 56
57/* Rotate right two 32 bit numbers as a 56 bit number */ 57/* Rotate right two 32 bit numbers as a 56 bit number */
@@ -73,8 +73,8 @@ do { \
73 * /afs/transarc.com/public/afsps/afs.rel31b.export-src/rxkad/sboxes.h 73 * /afs/transarc.com/public/afsps/afs.rel31b.export-src/rxkad/sboxes.h
74 */ 74 */
75#undef Z 75#undef Z
76#define Z(x) __constant_be32_to_cpu(x << 3) 76#define Z(x) __constant_cpu_to_be32(x << 3)
77static const u32 sbox0[256] = { 77static const __be32 sbox0[256] = {
78 Z(0xea), Z(0x7f), Z(0xb2), Z(0x64), Z(0x9d), Z(0xb0), Z(0xd9), Z(0x11), 78 Z(0xea), Z(0x7f), Z(0xb2), Z(0x64), Z(0x9d), Z(0xb0), Z(0xd9), Z(0x11),
79 Z(0xcd), Z(0x86), Z(0x86), Z(0x91), Z(0x0a), Z(0xb2), Z(0x93), Z(0x06), 79 Z(0xcd), Z(0x86), Z(0x86), Z(0x91), Z(0x0a), Z(0xb2), Z(0x93), Z(0x06),
80 Z(0x0e), Z(0x06), Z(0xd2), Z(0x65), Z(0x73), Z(0xc5), Z(0x28), Z(0x60), 80 Z(0x0e), Z(0x06), Z(0xd2), Z(0x65), Z(0x73), Z(0xc5), Z(0x28), Z(0x60),
@@ -110,8 +110,8 @@ static const u32 sbox0[256] = {
110}; 110};
111 111
112#undef Z 112#undef Z
113#define Z(x) __constant_be32_to_cpu((x << 27) | (x >> 5)) 113#define Z(x) __constant_cpu_to_be32((x << 27) | (x >> 5))
114static const u32 sbox1[256] = { 114static const __be32 sbox1[256] = {
115 Z(0x77), Z(0x14), Z(0xa6), Z(0xfe), Z(0xb2), Z(0x5e), Z(0x8c), Z(0x3e), 115 Z(0x77), Z(0x14), Z(0xa6), Z(0xfe), Z(0xb2), Z(0x5e), Z(0x8c), Z(0x3e),
116 Z(0x67), Z(0x6c), Z(0xa1), Z(0x0d), Z(0xc2), Z(0xa2), Z(0xc1), Z(0x85), 116 Z(0x67), Z(0x6c), Z(0xa1), Z(0x0d), Z(0xc2), Z(0xa2), Z(0xc1), Z(0x85),
117 Z(0x6c), Z(0x7b), Z(0x67), Z(0xc6), Z(0x23), Z(0xe3), Z(0xf2), Z(0x89), 117 Z(0x6c), Z(0x7b), Z(0x67), Z(0xc6), Z(0x23), Z(0xe3), Z(0xf2), Z(0x89),
@@ -147,8 +147,8 @@ static const u32 sbox1[256] = {
147}; 147};
148 148
149#undef Z 149#undef Z
150#define Z(x) __constant_be32_to_cpu(x << 11) 150#define Z(x) __constant_cpu_to_be32(x << 11)
151static const u32 sbox2[256] = { 151static const __be32 sbox2[256] = {
152 Z(0xf0), Z(0x37), Z(0x24), Z(0x53), Z(0x2a), Z(0x03), Z(0x83), Z(0x86), 152 Z(0xf0), Z(0x37), Z(0x24), Z(0x53), Z(0x2a), Z(0x03), Z(0x83), Z(0x86),
153 Z(0xd1), Z(0xec), Z(0x50), Z(0xf0), Z(0x42), Z(0x78), Z(0x2f), Z(0x6d), 153 Z(0xd1), Z(0xec), Z(0x50), Z(0xf0), Z(0x42), Z(0x78), Z(0x2f), Z(0x6d),
154 Z(0xbf), Z(0x80), Z(0x87), Z(0x27), Z(0x95), Z(0xe2), Z(0xc5), Z(0x5d), 154 Z(0xbf), Z(0x80), Z(0x87), Z(0x27), Z(0x95), Z(0xe2), Z(0xc5), Z(0x5d),
@@ -184,8 +184,8 @@ static const u32 sbox2[256] = {
184}; 184};
185 185
186#undef Z 186#undef Z
187#define Z(x) __constant_be32_to_cpu(x << 19) 187#define Z(x) __constant_cpu_to_be32(x << 19)
188static const u32 sbox3[256] = { 188static const __be32 sbox3[256] = {
189 Z(0xa9), Z(0x2a), Z(0x48), Z(0x51), Z(0x84), Z(0x7e), Z(0x49), Z(0xe2), 189 Z(0xa9), Z(0x2a), Z(0x48), Z(0x51), Z(0x84), Z(0x7e), Z(0x49), Z(0xe2),
190 Z(0xb5), Z(0xb7), Z(0x42), Z(0x33), Z(0x7d), Z(0x5d), Z(0xa6), Z(0x12), 190 Z(0xb5), Z(0xb7), Z(0x42), Z(0x33), Z(0x7d), Z(0x5d), Z(0xa6), Z(0x12),
191 Z(0x44), Z(0x48), Z(0x6d), Z(0x28), Z(0xaa), Z(0x20), Z(0x6d), Z(0x57), 191 Z(0x44), Z(0x48), Z(0x6d), Z(0x28), Z(0xaa), Z(0x20), Z(0x6d), Z(0x57),
@@ -225,7 +225,7 @@ static const u32 sbox3[256] = {
225 */ 225 */
226#define F_ENCRYPT(R, L, sched) \ 226#define F_ENCRYPT(R, L, sched) \
227do { \ 227do { \
228 union lc4 { u32 l; u8 c[4]; } u; \ 228 union lc4 { __be32 l; u8 c[4]; } u; \
229 u.l = sched ^ R; \ 229 u.l = sched ^ R; \
230 L ^= sbox0[u.c[0]] ^ sbox1[u.c[1]] ^ sbox2[u.c[2]] ^ sbox3[u.c[3]]; \ 230 L ^= sbox0[u.c[0]] ^ sbox1[u.c[1]] ^ sbox2[u.c[2]] ^ sbox3[u.c[3]]; \
231} while(0) 231} while(0)
@@ -237,7 +237,7 @@ static void fcrypt_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
237{ 237{
238 const struct fcrypt_ctx *ctx = crypto_tfm_ctx(tfm); 238 const struct fcrypt_ctx *ctx = crypto_tfm_ctx(tfm);
239 struct { 239 struct {
240 u32 l, r; 240 __be32 l, r;
241 } X; 241 } X;
242 242
243 memcpy(&X, src, sizeof(X)); 243 memcpy(&X, src, sizeof(X));
@@ -269,7 +269,7 @@ static void fcrypt_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
269{ 269{
270 const struct fcrypt_ctx *ctx = crypto_tfm_ctx(tfm); 270 const struct fcrypt_ctx *ctx = crypto_tfm_ctx(tfm);
271 struct { 271 struct {
272 u32 l, r; 272 __be32 l, r;
273 } X; 273 } X;
274 274
275 memcpy(&X, src, sizeof(X)); 275 memcpy(&X, src, sizeof(X));
@@ -328,22 +328,22 @@ static int fcrypt_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int key
328 k |= (*key) >> 1; 328 k |= (*key) >> 1;
329 329
330 /* Use lower 32 bits for schedule, rotate by 11 each round (16 times) */ 330 /* Use lower 32 bits for schedule, rotate by 11 each round (16 times) */
331 ctx->sched[0x0] = be32_to_cpu(k); ror56_64(k, 11); 331 ctx->sched[0x0] = cpu_to_be32(k); ror56_64(k, 11);
332 ctx->sched[0x1] = be32_to_cpu(k); ror56_64(k, 11); 332 ctx->sched[0x1] = cpu_to_be32(k); ror56_64(k, 11);
333 ctx->sched[0x2] = be32_to_cpu(k); ror56_64(k, 11); 333 ctx->sched[0x2] = cpu_to_be32(k); ror56_64(k, 11);
334 ctx->sched[0x3] = be32_to_cpu(k); ror56_64(k, 11); 334 ctx->sched[0x3] = cpu_to_be32(k); ror56_64(k, 11);
335 ctx->sched[0x4] = be32_to_cpu(k); ror56_64(k, 11); 335 ctx->sched[0x4] = cpu_to_be32(k); ror56_64(k, 11);
336 ctx->sched[0x5] = be32_to_cpu(k); ror56_64(k, 11); 336 ctx->sched[0x5] = cpu_to_be32(k); ror56_64(k, 11);
337 ctx->sched[0x6] = be32_to_cpu(k); ror56_64(k, 11); 337 ctx->sched[0x6] = cpu_to_be32(k); ror56_64(k, 11);
338 ctx->sched[0x7] = be32_to_cpu(k); ror56_64(k, 11); 338 ctx->sched[0x7] = cpu_to_be32(k); ror56_64(k, 11);
339 ctx->sched[0x8] = be32_to_cpu(k); ror56_64(k, 11); 339 ctx->sched[0x8] = cpu_to_be32(k); ror56_64(k, 11);
340 ctx->sched[0x9] = be32_to_cpu(k); ror56_64(k, 11); 340 ctx->sched[0x9] = cpu_to_be32(k); ror56_64(k, 11);
341 ctx->sched[0xa] = be32_to_cpu(k); ror56_64(k, 11); 341 ctx->sched[0xa] = cpu_to_be32(k); ror56_64(k, 11);
342 ctx->sched[0xb] = be32_to_cpu(k); ror56_64(k, 11); 342 ctx->sched[0xb] = cpu_to_be32(k); ror56_64(k, 11);
343 ctx->sched[0xc] = be32_to_cpu(k); ror56_64(k, 11); 343 ctx->sched[0xc] = cpu_to_be32(k); ror56_64(k, 11);
344 ctx->sched[0xd] = be32_to_cpu(k); ror56_64(k, 11); 344 ctx->sched[0xd] = cpu_to_be32(k); ror56_64(k, 11);
345 ctx->sched[0xe] = be32_to_cpu(k); ror56_64(k, 11); 345 ctx->sched[0xe] = cpu_to_be32(k); ror56_64(k, 11);
346 ctx->sched[0xf] = be32_to_cpu(k); 346 ctx->sched[0xf] = cpu_to_be32(k);
347 347
348 return 0; 348 return 0;
349#else 349#else
@@ -369,22 +369,22 @@ static int fcrypt_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int key
369 lo |= (*key) >> 1; 369 lo |= (*key) >> 1;
370 370
371 /* Use lower 32 bits for schedule, rotate by 11 each round (16 times) */ 371 /* Use lower 32 bits for schedule, rotate by 11 each round (16 times) */
372 ctx->sched[0x0] = be32_to_cpu(lo); ror56(hi, lo, 11); 372 ctx->sched[0x0] = cpu_to_be32(lo); ror56(hi, lo, 11);
373 ctx->sched[0x1] = be32_to_cpu(lo); ror56(hi, lo, 11); 373 ctx->sched[0x1] = cpu_to_be32(lo); ror56(hi, lo, 11);
374 ctx->sched[0x2] = be32_to_cpu(lo); ror56(hi, lo, 11); 374 ctx->sched[0x2] = cpu_to_be32(lo); ror56(hi, lo, 11);
375 ctx->sched[0x3] = be32_to_cpu(lo); ror56(hi, lo, 11); 375 ctx->sched[0x3] = cpu_to_be32(lo); ror56(hi, lo, 11);
376 ctx->sched[0x4] = be32_to_cpu(lo); ror56(hi, lo, 11); 376 ctx->sched[0x4] = cpu_to_be32(lo); ror56(hi, lo, 11);
377 ctx->sched[0x5] = be32_to_cpu(lo); ror56(hi, lo, 11); 377 ctx->sched[0x5] = cpu_to_be32(lo); ror56(hi, lo, 11);
378 ctx->sched[0x6] = be32_to_cpu(lo); ror56(hi, lo, 11); 378 ctx->sched[0x6] = cpu_to_be32(lo); ror56(hi, lo, 11);
379 ctx->sched[0x7] = be32_to_cpu(lo); ror56(hi, lo, 11); 379 ctx->sched[0x7] = cpu_to_be32(lo); ror56(hi, lo, 11);
380 ctx->sched[0x8] = be32_to_cpu(lo); ror56(hi, lo, 11); 380 ctx->sched[0x8] = cpu_to_be32(lo); ror56(hi, lo, 11);
381 ctx->sched[0x9] = be32_to_cpu(lo); ror56(hi, lo, 11); 381 ctx->sched[0x9] = cpu_to_be32(lo); ror56(hi, lo, 11);
382 ctx->sched[0xa] = be32_to_cpu(lo); ror56(hi, lo, 11); 382 ctx->sched[0xa] = cpu_to_be32(lo); ror56(hi, lo, 11);
383 ctx->sched[0xb] = be32_to_cpu(lo); ror56(hi, lo, 11); 383 ctx->sched[0xb] = cpu_to_be32(lo); ror56(hi, lo, 11);
384 ctx->sched[0xc] = be32_to_cpu(lo); ror56(hi, lo, 11); 384 ctx->sched[0xc] = cpu_to_be32(lo); ror56(hi, lo, 11);
385 ctx->sched[0xd] = be32_to_cpu(lo); ror56(hi, lo, 11); 385 ctx->sched[0xd] = cpu_to_be32(lo); ror56(hi, lo, 11);
386 ctx->sched[0xe] = be32_to_cpu(lo); ror56(hi, lo, 11); 386 ctx->sched[0xe] = cpu_to_be32(lo); ror56(hi, lo, 11);
387 ctx->sched[0xf] = be32_to_cpu(lo); 387 ctx->sched[0xf] = cpu_to_be32(lo);
388 return 0; 388 return 0;
389#endif 389#endif
390} 390}