From cd1d1128160e64289b02f80d677d89905981d0e2 Mon Sep 17 00:00:00 2001 From: ethers Date: Mon, 8 May 2017 21:30:16 -0700 Subject: Comment update SHA3-256 to Keccak-256 Could have been part of https://github.com/ethereum/solidity/commit/aefb6e5fcf9adc7c58da9ec0454707305f7e9ac9 --- libdevcore/SHA3.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libdevcore/SHA3.h b/libdevcore/SHA3.h index ce075521..73cb92ae 100644 --- a/libdevcore/SHA3.h +++ b/libdevcore/SHA3.h @@ -31,26 +31,26 @@ namespace dev // SHA-3 convenience routines. -/// Calculate SHA3-256 hash of the given input and load it into the given output. +/// Calculate Keccak-256 hash of the given input and load it into the given output. /// @returns false if o_output.size() != 32. bool keccak256(bytesConstRef _input, bytesRef o_output); -/// Calculate SHA3-256 hash of the given input, returning as a 256-bit hash. +/// Calculate Keccak-256 hash of the given input, returning as a 256-bit hash. inline h256 keccak256(bytesConstRef _input) { h256 ret; keccak256(_input, ret.ref()); return ret; } -/// Calculate SHA3-256 hash of the given input, returning as a 256-bit hash. +/// Calculate Keccak-256 hash of the given input, returning as a 256-bit hash. inline h256 keccak256(bytes const& _input) { return keccak256(bytesConstRef(&_input)); } -/// Calculate SHA3-256 hash of the given input (presented as a binary-filled string), returning as a 256-bit hash. +/// Calculate Keccak-256 hash of the given input (presented as a binary-filled string), returning as a 256-bit hash. inline h256 keccak256(std::string const& _input) { return keccak256(bytesConstRef(_input)); } -/// Calculate SHA3-256 hash of the given input (presented as a FixedHash), returns a 256-bit hash. +/// Calculate Keccak-256 hash of the given input (presented as a FixedHash), returns a 256-bit hash. template inline h256 keccak256(FixedHash const& _input) { return keccak256(_input.ref()); } -/// Calculate SHA3-256 hash of the given input, possibly interpreting it as nibbles, and return the hash as a string filled with binary data. +/// Calculate Keccak-256 hash of the given input, possibly interpreting it as nibbles, and return the hash as a string filled with binary data. inline std::string keccak256(std::string const& _input, bool _isNibbles) { return asString((_isNibbles ? keccak256(fromHex(_input)) : keccak256(bytesConstRef(&_input))).asBytes()); } -/// Calculate SHA3-256 MAC +/// Calculate Keccak-256 MAC inline void keccak256mac(bytesConstRef _secret, bytesConstRef _plain, bytesRef _output) { keccak256(_secret.toBytes() + _plain.toBytes()).ref().populate(_output); } } -- cgit From 9e62e9b1b774bf80e10e20da42bc3b04b50e6392 Mon Sep 17 00:00:00 2001 From: ethers Date: Fri, 12 May 2017 22:30:14 -0400 Subject: Comment update SHA3-256 to Keccak-256 (title) --- libdevcore/SHA3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdevcore/SHA3.h b/libdevcore/SHA3.h index 73cb92ae..1a561066 100644 --- a/libdevcore/SHA3.h +++ b/libdevcore/SHA3.h @@ -29,7 +29,7 @@ namespace dev { -// SHA-3 convenience routines. +// Keccak-256 convenience routines. /// Calculate Keccak-256 hash of the given input and load it into the given output. /// @returns false if o_output.size() != 32. -- cgit