From 0bc41054fbafbe2394a158e06850347243457b53 Mon Sep 17 00:00:00 2001 From: Santo Cariotti Date: Fri, 15 Oct 2021 19:37:42 +0200 Subject: style: clang-format --- include/sha.h | 12 +++++++----- include/sha256.h | 39 ++++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 24 deletions(-) (limited to 'include') diff --git a/include/sha.h b/include/sha.h index 255c769..8459ca2 100644 --- a/include/sha.h +++ b/include/sha.h @@ -7,17 +7,19 @@ #ifndef HMACSHA256_SHA_H_ #define HMACSHA256_SHA_H_ -#include -#include +#include +#include namespace hmacsha256 { class SHA { public: - SHA() { + SHA() + { digest_ = new uint8_t[32]; } - ~SHA() { + ~SHA() + { delete digest_; } @@ -25,6 +27,7 @@ public: virtual uint8_t* digest() = 0; virtual std::string hexdigest() = 0; + protected: uint8_t* digest_; @@ -51,7 +54,6 @@ protected: virtual void transform() = 0; }; - } // namespace hmacsha256 #endif // HMACSHA256_SHA_H_ diff --git a/include/sha256.h b/include/sha256.h index 921a50f..2cf0916 100644 --- a/include/sha256.h +++ b/include/sha256.h @@ -7,9 +7,9 @@ #ifndef HMACSHA256_SHA256_H_ #define HMACSHA256_SHA256_H_ -#include -#include #include "sha.h" +#include +#include namespace hmacsha256 { class SHA256 : public SHA { @@ -23,25 +23,26 @@ public: uint8_t* digest() override; std::string hexdigest() override; + private: // first 80 costansts 64bit words, paragraph 4.2.2 std::array K = { - 0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5, - 0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5, - 0xd807aa98,0x12835b01,0x243185be,0x550c7dc3, - 0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174, - 0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc, - 0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da, - 0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7, - 0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967, - 0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13, - 0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85, - 0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3, - 0xd192e819,0xd6990624,0xf40e3585,0x106aa070, - 0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5, - 0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3, - 0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208, - 0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2 + 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, + 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, + 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, + 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, + 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, + 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, + 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, + 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, + 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, + 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, + 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, + 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, + 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, + 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, + 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, + 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 }; // the constructor @@ -57,7 +58,7 @@ private: // with 0 <= n < w. // w, in our case is 32 // - // rots is also defined in the NIST document as + // rots is also defined in the NIST document as // rotr(x) = (x >> n) or (x << w - n) static uint32_t rotr(uint32_t, uint32_t); -- cgit v1.2.3-18-g5258