From 154f43d188d5727078d34895636a04b35e977402 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Fri, 27 Jan 2017 15:00:20 +1100 Subject: [PATCH] sha2: style --- hash/sha2.cpp | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/hash/sha2.cpp b/hash/sha2.cpp index e6075b49..8cd9f664 100644 --- a/hash/sha2.cpp +++ b/hash/sha2.cpp @@ -70,27 +70,34 @@ uint64_t K_80[] = { /////////////////////////////////////////////////////////////////////////////// -static constexpr uint32_t -Ch (uint32_t x, uint32_t y, uint32_t z) { +static constexpr +uint32_t +Ch (uint32_t x, uint32_t y, uint32_t 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); } /////////////////////////////////////////////////////////////////////////////// #define FUNC(NAME,r0,r1,r2) \ -static constexpr uint32_t \ -NAME (uint32_t x) { \ +static constexpr \ +uint32_t \ +NAME (uint32_t x) \ +{ \ return util::rotater (x, (r0)) ^ \ util::rotater (x, (r1)) ^ \ util::rotater (x, (r2)); \ } - FUNC(S0, 2, 13, 22) FUNC(S1, 6, 11, 25) @@ -100,7 +107,9 @@ FUNC(S1, 6, 11, 25) /////////////////////////////////////////////////////////////////////////////// #define FUNC(NAME,r0,r1,s) \ static constexpr \ -uint32_t NAME (uint32_t x) { \ +uint32_t \ +NAME (uint32_t x) \ +{ \ return util::rotater (x, (r0)) ^ \ util::rotater (x, (r1)) ^ \ (x >> (s)); \