diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2012-01-26 15:03:16 +1100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-20 12:48:12 -0800 |
| commit | d122aed32ad780e0c337551121c36a5d5e1c2ee0 (patch) | |
| tree | 1b76f8a32d9a5ad20507e790f17674e953f41e4c /crypto/sha512_generic.c | |
| parent | 0f74c152fd01e1070c141eb10c70cc0f6fb39e22 (diff) | |
| download | kernel_samsung_smdk4412-d122aed32ad780e0c337551121c36a5d5e1c2ee0.zip kernel_samsung_smdk4412-d122aed32ad780e0c337551121c36a5d5e1c2ee0.tar.gz kernel_samsung_smdk4412-d122aed32ad780e0c337551121c36a5d5e1c2ee0.tar.bz2 | |
crypto: sha512 - Use binary and instead of modulus
commit 58d7d18b5268febb8b1391c6dffc8e2aaa751fcd upstream.
The previous patch used the modulus operator over a power of 2
unnecessarily which may produce suboptimal binary code. This
patch changes changes them to binary ands instead.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto/sha512_generic.c')
| -rw-r--r-- | crypto/sha512_generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/sha512_generic.c b/crypto/sha512_generic.c index 88f160b..3edebfd 100644 --- a/crypto/sha512_generic.c +++ b/crypto/sha512_generic.c @@ -78,7 +78,7 @@ static inline void LOAD_OP(int I, u64 *W, const u8 *input) static inline void BLEND_OP(int I, u64 *W) { - W[I % 16] += s1(W[(I-2) % 16]) + W[(I-7) % 16] + s0(W[(I-15) % 16]); + W[I & 15] += s1(W[(I-2) & 15]) + W[(I-7) & 15] + s0(W[(I-15) & 15]); } static void @@ -105,7 +105,7 @@ sha512_transform(u64 *state, const u8 *input) #define SHA512_16_79(i, a, b, c, d, e, f, g, h) \ BLEND_OP(i, W); \ - t1 = h + e1(e) + Ch(e, f, g) + sha512_K[i] + W[(i)%16]; \ + t1 = h + e1(e) + Ch(e, f, g) + sha512_K[i] + W[(i)&15]; \ t2 = e0(a) + Maj(a, b, c); \ d += t1; \ h = t1 + t2 |