aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/hash/par_hash
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-12-11 15:28:38 -0500
committerJack Lloyd <[email protected]>2016-12-18 16:48:24 -0500
commitf3cb3edb512bdcab498d825886c3366c341b3f78 (patch)
tree645c73ec295a5a34f25d99903b6d9fa9751e86d3 /src/lib/hash/par_hash
parentc1dd21253c1f3188ff45d3ad47698efd08235ae8 (diff)
Convert to using standard uintN_t integer types
Renames a couple of functions for somewhat better name consistency, eg make_u32bit becomes make_uint32. The old typedefs remain for now since probably lots of application code uses them.
Diffstat (limited to 'src/lib/hash/par_hash')
-rw-r--r--src/lib/hash/par_hash/par_hash.cpp6
-rw-r--r--src/lib/hash/par_hash/par_hash.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/hash/par_hash/par_hash.cpp b/src/lib/hash/par_hash/par_hash.cpp
index 7320afee3..2a1ef7c9c 100644
--- a/src/lib/hash/par_hash/par_hash.cpp
+++ b/src/lib/hash/par_hash/par_hash.cpp
@@ -10,15 +10,15 @@
namespace Botan {
-void Parallel::add_data(const byte input[], size_t length)
+void Parallel::add_data(const uint8_t input[], size_t length)
{
for(auto&& hash : m_hashes)
hash->update(input, length);
}
-void Parallel::final_result(byte out[])
+void Parallel::final_result(uint8_t out[])
{
- u32bit offset = 0;
+ uint32_t offset = 0;
for(auto&& hash : m_hashes)
{
diff --git a/src/lib/hash/par_hash/par_hash.h b/src/lib/hash/par_hash/par_hash.h
index 67d026c2f..cbc2ad591 100644
--- a/src/lib/hash/par_hash/par_hash.h
+++ b/src/lib/hash/par_hash/par_hash.h
@@ -36,8 +36,8 @@ class BOTAN_DLL Parallel final : public HashFunction
private:
Parallel() {}
- void add_data(const byte[], size_t) override;
- void final_result(byte[]) override;
+ void add_data(const uint8_t[], size_t) override;
+ void final_result(uint8_t[]) override;
std::vector<std::unique_ptr<HashFunction>> m_hashes;
};