aboutsummaryrefslogtreecommitdiffstats
path: root/libdevcore
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-08-25 18:13:26 +0800
committerchriseth <chris@ethereum.org>2017-08-25 18:13:26 +0800
commit157b5f1ae9dfdec8e82c9d1febb12d5d60dbc465 (patch)
treed2a0c9d89910c7af0b0696111000cb39d538cb4a /libdevcore
parent012d9f7906bce1e156a44392bbb4aea7ccd9f85d (diff)
downloaddexon-solidity-157b5f1ae9dfdec8e82c9d1febb12d5d60dbc465.tar
dexon-solidity-157b5f1ae9dfdec8e82c9d1febb12d5d60dbc465.tar.gz
dexon-solidity-157b5f1ae9dfdec8e82c9d1febb12d5d60dbc465.tar.bz2
dexon-solidity-157b5f1ae9dfdec8e82c9d1febb12d5d60dbc465.tar.lz
dexon-solidity-157b5f1ae9dfdec8e82c9d1febb12d5d60dbc465.tar.xz
dexon-solidity-157b5f1ae9dfdec8e82c9d1febb12d5d60dbc465.tar.zst
dexon-solidity-157b5f1ae9dfdec8e82c9d1febb12d5d60dbc465.zip
Cleanup of SHA3.h
Diffstat (limited to 'libdevcore')
-rw-r--r--libdevcore/SHA3.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/libdevcore/SHA3.h b/libdevcore/SHA3.h
index 1a561066..d1e2cc98 100644
--- a/libdevcore/SHA3.h
+++ b/libdevcore/SHA3.h
@@ -23,8 +23,9 @@
#pragma once
+#include <libdevcore/FixedHash.h>
+
#include <string>
-#include "FixedHash.h"
namespace dev
{
@@ -47,10 +48,4 @@ inline h256 keccak256(std::string const& _input) { return keccak256(bytesConstRe
/// Calculate Keccak-256 hash of the given input (presented as a FixedHash), returns a 256-bit hash.
template<unsigned N> inline h256 keccak256(FixedHash<N> const& _input) { return keccak256(_input.ref()); }
-/// 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 Keccak-256 MAC
-inline void keccak256mac(bytesConstRef _secret, bytesConstRef _plain, bytesRef _output) { keccak256(_secret.toBytes() + _plain.toBytes()).ref().populate(_output); }
-
}