diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index f603881..81469bd 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,5 +1,103 @@ + + diff --git a/.idea/emsha.iml b/.idea/emsha.iml index f08604b..4c94235 100644 --- a/.idea/emsha.iml +++ b/.idea/emsha.iml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 79b3c94..0b76fe5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,7 @@ + + \ No newline at end of file diff --git a/include/emsha/sha256.h b/include/emsha/sha256.h index 61b0795..85d1223 100644 --- a/include/emsha/sha256.h +++ b/include/emsha/sha256.h @@ -155,7 +155,6 @@ private: inline void updateMessageBlock(void); inline void padMessage(uint8_t pc); uint32_t chunkToUint32(uint32_t offset); - uint32_t uint32ToChunk(uint32_t offset); EMSHAResult reset(); }; // end class SHA256 diff --git a/src/sha256.cc b/src/sha256.cc index 4eaf022..a264b1f 100644 --- a/src/sha256.cc +++ b/src/sha256.cc @@ -158,23 +158,8 @@ SHA256::chunkToUint32(uint32_t offset) } -uint32_t -SHA256::uint32ToChunk(uint32_t offset) -{ - uint32_t chunk = 0U; - - for (uint32_t i = offset; i < offset+4U; i++) { - chunk <<= 8; - chunk += static_cast(this->mb[i]); - } - - return chunk; - -} - - static void -uint32ToChunkInPlace(uint32_t x, uint8_t *chunk) +uint32ToChunkInPlace(const uint32_t x, uint8_t *chunk) { chunk[0] = static_cast((x & 0xff000000u) >> 24); chunk[1] = static_cast((x & 0x00ff0000u) >> 16); diff --git a/test/test_sha256.cc b/test/test_sha256.cc index 5ffd758..ad56028 100644 --- a/test/test_sha256.cc +++ b/test/test_sha256.cc @@ -76,7 +76,7 @@ main() #ifdef EMSHA_NO_SELFTEST cout << "[NOTICE] internal self-tests have been disabled.\n"; #else - auto selfTestStatus = emsha::SHA256SelfTest(); + const auto selfTestStatus = emsha::SHA256SelfTest(); switch (selfTestStatus) { case emsha::EMSHAResult::OK: cout << "PASSED: SHA-256 self test\n";