diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-11-28 07:49:19 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2008-12-24 19:02:03 -0500 |
commit | dad3df2044b78ba68a92bf78e38a408bab80ff61 (patch) | |
tree | bd65de4034a3ac1175d858d935b0a0c2b89981f1 /crypto/fcrypt.c | |
parent | 664134d2916109be76648977705a2bea3ff76427 (diff) |
crypto: remove uses of __constant_{endian} helpers
Base versions handle constant folding just fine.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/fcrypt.c')
-rw-r--r-- | crypto/fcrypt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/fcrypt.c b/crypto/fcrypt.c index 1302f4cae337..b82d61f4e26c 100644 --- a/crypto/fcrypt.c +++ b/crypto/fcrypt.c | |||
@@ -73,7 +73,7 @@ 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_cpu_to_be32(x << 3) | 76 | #define Z(x) cpu_to_be32(x << 3) |
77 | static const __be32 sbox0[256] = { | 77 | static 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), |
@@ -110,7 +110,7 @@ static const __be32 sbox0[256] = { | |||
110 | }; | 110 | }; |
111 | 111 | ||
112 | #undef Z | 112 | #undef Z |
113 | #define Z(x) __constant_cpu_to_be32((x << 27) | (x >> 5)) | 113 | #define Z(x) cpu_to_be32((x << 27) | (x >> 5)) |
114 | static const __be32 sbox1[256] = { | 114 | static 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), |
@@ -147,7 +147,7 @@ static const __be32 sbox1[256] = { | |||
147 | }; | 147 | }; |
148 | 148 | ||
149 | #undef Z | 149 | #undef Z |
150 | #define Z(x) __constant_cpu_to_be32(x << 11) | 150 | #define Z(x) cpu_to_be32(x << 11) |
151 | static const __be32 sbox2[256] = { | 151 | static 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), |
@@ -184,7 +184,7 @@ static const __be32 sbox2[256] = { | |||
184 | }; | 184 | }; |
185 | 185 | ||
186 | #undef Z | 186 | #undef Z |
187 | #define Z(x) __constant_cpu_to_be32(x << 19) | 187 | #define Z(x) cpu_to_be32(x << 19) |
188 | static const __be32 sbox3[256] = { | 188 | static 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), |