aboutsummaryrefslogtreecommitdiffstats
path: root/src/hash/sha2_32
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-10-12 23:29:55 +0000
committerlloyd <[email protected]>2010-10-12 23:29:55 +0000
commit2af9ba577730f071eef44b3ba492c3bfad0a8ec6 (patch)
tree92a4c4e973756225d42bb99a99110b2669be7299 /src/hash/sha2_32
parent97e8d6086171772cd5e45bcf2f5b1ea1e38e6bf5 (diff)
Use size_t for BufferedComputation::add_data
Diffstat (limited to 'src/hash/sha2_32')
-rw-r--r--src/hash/sha2_32/sha2_32.cpp18
-rw-r--r--src/hash/sha2_32/sha2_32.h4
2 files changed, 11 insertions, 11 deletions
diff --git a/src/hash/sha2_32/sha2_32.cpp b/src/hash/sha2_32/sha2_32.cpp
index acd06061e..6bbf6dec9 100644
--- a/src/hash/sha2_32/sha2_32.cpp
+++ b/src/hash/sha2_32/sha2_32.cpp
@@ -48,17 +48,17 @@ inline void F1(u32bit A, u32bit B, u32bit C, u32bit& D,
*/
void sha2_32_compress(MemoryRegion<u32bit>& W,
MemoryRegion<u32bit>& digest,
- const byte input[], u32bit blocks)
+ const byte input[], size_t blocks)
{
u32bit A = digest[0], B = digest[1], C = digest[2],
D = digest[3], E = digest[4], F = digest[5],
G = digest[6], H = digest[7];
- for(u32bit i = 0; i != blocks; ++i)
+ for(size_t i = 0; i != blocks; ++i)
{
load_be(&W[0], input, 16);
- for(u32bit j = 16; j != 64; j += 8)
+ for(size_t j = 16; j != 64; j += 8)
{
W[j ] = sigma(W[j- 2], 17, 19, 10) + W[j-7] +
sigma(W[j-15], 7, 18, 3) + W[j-16];
@@ -161,7 +161,7 @@ void sha2_32_compress(MemoryRegion<u32bit>& W,
/*
* SHA-224 compression function
*/
-void SHA_224::compress_n(const byte input[], u32bit blocks)
+void SHA_224::compress_n(const byte input[], size_t blocks)
{
sha2_32_compress(W, digest, input, blocks);
}
@@ -171,8 +171,8 @@ void SHA_224::compress_n(const byte input[], u32bit blocks)
*/
void SHA_224::copy_out(byte output[])
{
- for(u32bit j = 0; j != OUTPUT_LENGTH; j += 4)
- store_be(digest[j/4], output + j);
+ for(size_t i = 0; i != OUTPUT_LENGTH; i += 4)
+ store_be(digest[i/4], output + i);
}
/*
@@ -195,7 +195,7 @@ void SHA_224::clear()
/*
* SHA-256 compression function
*/
-void SHA_256::compress_n(const byte input[], u32bit blocks)
+void SHA_256::compress_n(const byte input[], size_t blocks)
{
sha2_32_compress(W, digest, input, blocks);
}
@@ -205,8 +205,8 @@ void SHA_256::compress_n(const byte input[], u32bit blocks)
*/
void SHA_256::copy_out(byte output[])
{
- for(u32bit j = 0; j != OUTPUT_LENGTH; j += 4)
- store_be(digest[j/4], output + j);
+ for(size_t i = 0; i != OUTPUT_LENGTH; i += 4)
+ store_be(digest[i/4], output + i);
}
/*
diff --git a/src/hash/sha2_32/sha2_32.h b/src/hash/sha2_32/sha2_32.h
index a3e3a6f19..3b95812b8 100644
--- a/src/hash/sha2_32/sha2_32.h
+++ b/src/hash/sha2_32/sha2_32.h
@@ -26,7 +26,7 @@ class BOTAN_DLL SHA_224 : public MDx_HashFunction
SHA_224() : MDx_HashFunction(28, 64, true, true), W(64), digest(8)
{ clear(); }
private:
- void compress_n(const byte[], u32bit blocks);
+ void compress_n(const byte[], size_t blocks);
void copy_out(byte[]);
SecureVector<u32bit> W, digest;
@@ -45,7 +45,7 @@ class BOTAN_DLL SHA_256 : public MDx_HashFunction
SHA_256() : MDx_HashFunction(32, 64, true, true), W(64), digest(8)
{ clear(); }
private:
- void compress_n(const byte[], u32bit blocks);
+ void compress_n(const byte[], size_t blocks);
void copy_out(byte[]);
SecureVector<u32bit> W, digest;