nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

sha2: style

Browse Source
This commit is contained in:
Danny Robson 2017-01-27 15:00:20 +11:00
parent 4a73c1761b
commit 154f43d188
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hash/sha2.cpp
View File

@ -70,27 +70,34 @@ uint64_t K_80[] = {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
static constexpr uint32_t static constexpr
Ch (uint32_t x, uint32_t y, uint32_t z) { uint32_t
Ch (uint32_t x, uint32_t y, uint32_t z)
{
return (x & y) ^ (~x & z); return (x & y) ^ (~x & z);
} }
static constexpr uint32_t
Maj (uint32_t x, uint32_t y, uint32_t z) { //-----------------------------------------------------------------------------
static constexpr
uint32_t
Maj (uint32_t x, uint32_t y, uint32_t z)
{
return (x & y) ^ (x & z) ^ (y & z); return (x & y) ^ (x & z) ^ (y & z);
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define FUNC(NAME,r0,r1,r2) \ #define FUNC(NAME,r0,r1,r2) \
static constexpr uint32_t \ static constexpr \
NAME (uint32_t x) { \ uint32_t \
NAME (uint32_t x) \
{ \
return util::rotater (x, (r0)) ^ \ return util::rotater (x, (r0)) ^ \
util::rotater (x, (r1)) ^ \ util::rotater (x, (r1)) ^ \
util::rotater (x, (r2)); \ util::rotater (x, (r2)); \
} }
FUNC(S0, 2, 13, 22) FUNC(S0, 2, 13, 22)
FUNC(S1, 6, 11, 25) FUNC(S1, 6, 11, 25)
@ -100,7 +107,9 @@ FUNC(S1, 6, 11, 25)
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define FUNC(NAME,r0,r1,s) \ #define FUNC(NAME,r0,r1,s) \
static constexpr \ static constexpr \
uint32_t NAME (uint32_t x) { \ uint32_t \
NAME (uint32_t x) \
{ \
return util::rotater (x, (r0)) ^ \ return util::rotater (x, (r0)) ^ \
util::rotater (x, (r1)) ^ \ util::rotater (x, (r1)) ^ \
(x >> (s)); \ (x >> (s)); \