Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: sha512 - use standard ror64()
+24
-9
+4
-9
crypto/sha512_generic.c
+4
-9
crypto/sha512_generic.c
···
31
31
return (x & y) | (z & (x | y));
32
32
}
33
33
34
-
static inline u64 RORu64(u64 x, u64 y)
35
-
{
36
-
return (x >> y) | (x << (64 - y));
37
-
}
38
-
39
34
static const u64 sha512_K[80] = {
40
35
0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL,
41
36
0xe9b5dba58189dbbcULL, 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
···
61
66
0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL,
62
67
};
63
68
64
-
#define e0(x) (RORu64(x,28) ^ RORu64(x,34) ^ RORu64(x,39))
65
-
#define e1(x) (RORu64(x,14) ^ RORu64(x,18) ^ RORu64(x,41))
66
-
#define s0(x) (RORu64(x, 1) ^ RORu64(x, 8) ^ (x >> 7))
67
-
#define s1(x) (RORu64(x,19) ^ RORu64(x,61) ^ (x >> 6))
69
+
#define e0(x) (ror64(x,28) ^ ror64(x,34) ^ ror64(x,39))
70
+
#define e1(x) (ror64(x,14) ^ ror64(x,18) ^ ror64(x,41))
71
+
#define s0(x) (ror64(x, 1) ^ ror64(x, 8) ^ (x >> 7))
72
+
#define s1(x) (ror64(x,19) ^ ror64(x,61) ^ (x >> 6))
68
73
69
74
static inline void LOAD_OP(int I, u64 *W, const u8 *input)
70
75
{
+20
include/linux/bitops.h
+20
include/linux/bitops.h
···
56
56
}
57
57
58
58
/**
59
+
* rol64 - rotate a 64-bit value left
60
+
* @word: value to rotate
61
+
* @shift: bits to roll
62
+
*/
63
+
static inline __u64 rol64(__u64 word, unsigned int shift)
64
+
{
65
+
return (word << shift) | (word >> (64 - shift));
66
+
}
67
+
68
+
/**
69
+
* ror64 - rotate a 64-bit value right
70
+
* @word: value to rotate
71
+
* @shift: bits to roll
72
+
*/
73
+
static inline __u64 ror64(__u64 word, unsigned int shift)
74
+
{
75
+
return (word >> shift) | (word << (64 - shift));
76
+
}
77
+
78
+
/**
59
79
* rol32 - rotate a 32-bit value left
60
80
* @word: value to rotate
61
81
* @shift: bits to roll