diff --git a/GCryptLib/exec/visualize-hashing-distribution.cpp b/GCryptLib/exec/visualize-hashing-distribution.cpp index b444e2e..1b24c57 100644 --- a/GCryptLib/exec/visualize-hashing-distribution.cpp +++ b/GCryptLib/exec/visualize-hashing-distribution.cpp @@ -11,7 +11,7 @@ using namespace Leonetienne::Eule; void HashAndVisualize(const Block& b, const std::string filename) { GHash hasher; - hasher.DigestBlock(b); + hasher.Digest(b); VisualizeBlock(hasher.GetHashsum(), filename); } diff --git a/GCryptLib/include/GCrypt/GHash.h b/GCryptLib/include/GCrypt/GHash.h index 28e906a..08d01e4 100644 --- a/GCryptLib/include/GCrypt/GHash.h +++ b/GCryptLib/include/GCrypt/GHash.h @@ -16,7 +16,7 @@ namespace Leonetienne::GCrypt { //! WARNING: If you compute hashes using this digestive method, //! you REALLY REALLY should add a trailing block just containing the cleartext size! //! You MOST LIKELY just want to use the wrapper function GHash::CalculateHashsum(Flexblock const&) instead! - void DigestBlock(const Block& data); + void Digest(const Block& data); //! Will return the current hashsum const Block& GetHashsum() const; diff --git a/GCryptLib/src/GHash.cpp b/GCryptLib/src/GHash.cpp index dac6af8..c813505 100644 --- a/GCryptLib/src/GHash.cpp +++ b/GCryptLib/src/GHash.cpp @@ -24,7 +24,7 @@ namespace Leonetienne::GCrypt { return; } - void GHash::DigestBlock(const Block& data) { + void GHash::Digest(const Block& data) { // Set the cipher key to the current data to be hashed cipher.SetKey(data); @@ -50,7 +50,7 @@ namespace Leonetienne::GCrypt { // Digest all blocks for (const Block& block : data) { - hasher.DigestBlock(block); + hasher.Digest(block); } // Add an additional block, containing the length of the input @@ -75,7 +75,7 @@ namespace Leonetienne::GCrypt { lengthBlock.FromTextString(ss.str()); // Digest the length block - hasher.DigestBlock(lengthBlock); + hasher.Digest(lengthBlock); // Return the total hashsum return hasher.GetHashsum(); diff --git a/GCryptLib/src/GPrng.cpp b/GCryptLib/src/GPrng.cpp index cf284f0..205e308 100644 --- a/GCryptLib/src/GPrng.cpp +++ b/GCryptLib/src/GPrng.cpp @@ -5,7 +5,7 @@ namespace Leonetienne::GCrypt { GPrng::GPrng(const Block& seed) { this->seed = seed; - hasher.DigestBlock(seed); + hasher.Digest(seed); } GPrng::GPrng() { @@ -14,7 +14,7 @@ namespace Leonetienne::GCrypt { void GPrng::Seed(const Block& seed) { hasher = GHash(); this->seed = seed; - hasher.DigestBlock(seed); + hasher.Digest(seed); return; } @@ -37,7 +37,7 @@ namespace Leonetienne::GCrypt { // state of the hash function, unless the seed is known. // Advance the block (Add the current hashsum XOR seed to the hasher) - hasher.DigestBlock(Block(hasher.GetHashsum() ^ seed)); + hasher.Digest(Block(hasher.GetHashsum() ^ seed)); // Reset the pointer nextBit = 0;