diff options
author | lloyd <[email protected]> | 2010-09-13 12:28:27 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2010-09-13 12:28:27 +0000 |
commit | 27d79c87365105d6128afe9eaf8a82383976ed44 (patch) | |
tree | 9a4f0e1d5ae7ecd5c058c0293d9b546191990cdb /src/hash | |
parent | 9acfc3a50b31044e48d8dee5fc8030ad7f4518d4 (diff) |
Anywhere where we use MemoryRegion::begin to get access to the raw pointer
representation (rather than in an interator context), instead use &buf[0],
which works for both MemoryRegion and std::vector
Diffstat (limited to 'src/hash')
-rw-r--r-- | src/hash/bmw/bmw_512.cpp | 2 | ||||
-rw-r--r-- | src/hash/gost_3411/gost_3411.cpp | 6 | ||||
-rw-r--r-- | src/hash/has160/has160.cpp | 2 | ||||
-rw-r--r-- | src/hash/md2/md2.cpp | 4 | ||||
-rw-r--r-- | src/hash/md4/md4.cpp | 2 | ||||
-rw-r--r-- | src/hash/md5/md5.cpp | 2 | ||||
-rw-r--r-- | src/hash/mdx_hash/mdx_hash.cpp | 2 | ||||
-rw-r--r-- | src/hash/rmd128/rmd128.cpp | 2 | ||||
-rw-r--r-- | src/hash/rmd160/rmd160.cpp | 2 | ||||
-rw-r--r-- | src/hash/sha1/sha160.cpp | 2 | ||||
-rw-r--r-- | src/hash/sha2/sha2_32.cpp | 2 | ||||
-rw-r--r-- | src/hash/sha2/sha2_64.cpp | 2 | ||||
-rw-r--r-- | src/hash/skein/skein_512.cpp | 2 | ||||
-rw-r--r-- | src/hash/tiger/tiger.cpp | 2 | ||||
-rw-r--r-- | src/hash/whirlpool/whrlpool.cpp | 2 |
15 files changed, 18 insertions, 18 deletions
diff --git a/src/hash/bmw/bmw_512.cpp b/src/hash/bmw/bmw_512.cpp index a9b580ca6..f511e516b 100644 --- a/src/hash/bmw/bmw_512.cpp +++ b/src/hash/bmw/bmw_512.cpp @@ -143,7 +143,7 @@ void BMW_512::compress_n(const byte input[], u32bit blocks) { for(u32bit i = 0; i != blocks; ++i) { - load_le(M.begin(), input, M.size()); + load_le(&M[0], input, M.size()); BMW_512_compress(H, M, Q); diff --git a/src/hash/gost_3411/gost_3411.cpp b/src/hash/gost_3411/gost_3411.cpp index 7e6fd8fac..ad874fe8a 100644 --- a/src/hash/gost_3411/gost_3411.cpp +++ b/src/hash/gost_3411/gost_3411.cpp @@ -45,7 +45,7 @@ void GOST_34_11::add_data(const byte input[], u32bit length) if(position + length >= HASH_BLOCK_SIZE) { - compress_n(buffer.begin(), 1); + compress_n(&buffer[0], 1); input += (HASH_BLOCK_SIZE - position); length -= (HASH_BLOCK_SIZE - position); position = 0; @@ -219,7 +219,7 @@ void GOST_34_11::final_result(byte out[]) { if(position) { - clear_mem(buffer.begin() + position, buffer.size() - position); + clear_mem(&buffer[0] + position, buffer.size() - position); compress_n(buffer, 1); } @@ -232,7 +232,7 @@ void GOST_34_11::final_result(byte out[]) compress_n(length_buf, 1); compress_n(sum_buf, 1); - copy_mem(out, hash.begin(), 32); + copy_mem(out, &hash[0], 32); clear(); } diff --git a/src/hash/has160/has160.cpp b/src/hash/has160/has160.cpp index fd39e7ea0..5786ae0ee 100644 --- a/src/hash/has160/has160.cpp +++ b/src/hash/has160/has160.cpp @@ -67,7 +67,7 @@ void HAS_160::compress_n(const byte input[], u32bit blocks) for(u32bit i = 0; i != blocks; ++i) { - load_le(X.begin(), input, 16); + load_le(&X[0], input, 16); X[16] = X[ 0] ^ X[ 1] ^ X[ 2] ^ X[ 3]; X[17] = X[ 4] ^ X[ 5] ^ X[ 6] ^ X[ 7]; diff --git a/src/hash/md2/md2.cpp b/src/hash/md2/md2.cpp index b3ccae6df..376a95e93 100644 --- a/src/hash/md2/md2.cpp +++ b/src/hash/md2/md2.cpp @@ -66,7 +66,7 @@ void MD2::add_data(const byte input[], u32bit length) buffer.copy(position, input, length); if(position + length >= HASH_BLOCK_SIZE) { - hash(buffer.begin()); + hash(&buffer[0]); input += (HASH_BLOCK_SIZE - position); length -= (HASH_BLOCK_SIZE - position); while(length >= HASH_BLOCK_SIZE) @@ -90,7 +90,7 @@ void MD2::final_result(byte output[]) buffer[j] = static_cast<byte>(HASH_BLOCK_SIZE - position); hash(buffer); hash(checksum); - copy_mem(output, X.begin(), OUTPUT_LENGTH); + copy_mem(output, &X[0], OUTPUT_LENGTH); clear(); } diff --git a/src/hash/md4/md4.cpp b/src/hash/md4/md4.cpp index edba1d08a..326ca8eba 100644 --- a/src/hash/md4/md4.cpp +++ b/src/hash/md4/md4.cpp @@ -51,7 +51,7 @@ void MD4::compress_n(const byte input[], u32bit blocks) for(u32bit i = 0; i != blocks; ++i) { - load_le(M.begin(), input, M.size()); + load_le(&M[0], input, M.size()); FF(A,B,C,D,M[ 0], 3); FF(D,A,B,C,M[ 1], 7); FF(C,D,A,B,M[ 2],11); FF(B,C,D,A,M[ 3],19); diff --git a/src/hash/md5/md5.cpp b/src/hash/md5/md5.cpp index 104155e9d..b1745b944 100644 --- a/src/hash/md5/md5.cpp +++ b/src/hash/md5/md5.cpp @@ -64,7 +64,7 @@ void MD5::compress_n(const byte input[], u32bit blocks) for(u32bit i = 0; i != blocks; ++i) { - load_le(M.begin(), input, M.size()); + load_le(&M[0], input, M.size()); FF(A,B,C,D,M[ 0], 7,0xD76AA478); FF(D,A,B,C,M[ 1],12,0xE8C7B756); FF(C,D,A,B,M[ 2],17,0x242070DB); FF(B,C,D,A,M[ 3],22,0xC1BDCEEE); diff --git a/src/hash/mdx_hash/mdx_hash.cpp b/src/hash/mdx_hash/mdx_hash.cpp index ffca0d93b..69341c53f 100644 --- a/src/hash/mdx_hash/mdx_hash.cpp +++ b/src/hash/mdx_hash/mdx_hash.cpp @@ -47,7 +47,7 @@ void MDx_HashFunction::add_data(const byte input[], u32bit length) if(position + length >= HASH_BLOCK_SIZE) { - compress_n(buffer.begin(), 1); + compress_n(&buffer[0], 1); input += (HASH_BLOCK_SIZE - position); length -= (HASH_BLOCK_SIZE - position); position = 0; diff --git a/src/hash/rmd128/rmd128.cpp b/src/hash/rmd128/rmd128.cpp index 9e0f6701e..3e7eb9143 100644 --- a/src/hash/rmd128/rmd128.cpp +++ b/src/hash/rmd128/rmd128.cpp @@ -68,7 +68,7 @@ void RIPEMD_128::compress_n(const byte input[], u32bit blocks) for(u32bit i = 0; i != blocks; ++i) { - load_le(M.begin(), input, M.size()); + load_le(&M[0], input, M.size()); u32bit A1 = digest[0], A2 = A1, B1 = digest[1], B2 = B1, C1 = digest[2], C2 = C1, D1 = digest[3], D2 = D1; diff --git a/src/hash/rmd160/rmd160.cpp b/src/hash/rmd160/rmd160.cpp index 4975814f4..f832d4ec1 100644 --- a/src/hash/rmd160/rmd160.cpp +++ b/src/hash/rmd160/rmd160.cpp @@ -82,7 +82,7 @@ void RIPEMD_160::compress_n(const byte input[], u32bit blocks) for(u32bit i = 0; i != blocks; ++i) { - load_le(M.begin(), input, M.size()); + load_le(&M[0], input, M.size()); u32bit A1 = digest[0], A2 = A1, B1 = digest[1], B2 = B1, C1 = digest[2], C2 = C1, D1 = digest[3], D2 = D1, diff --git a/src/hash/sha1/sha160.cpp b/src/hash/sha1/sha160.cpp index 1e57f0cf4..0b3d7c346 100644 --- a/src/hash/sha1/sha160.cpp +++ b/src/hash/sha1/sha160.cpp @@ -61,7 +61,7 @@ void SHA_160::compress_n(const byte input[], u32bit blocks) for(u32bit i = 0; i != blocks; ++i) { - load_be(W.begin(), input, 16); + load_be(&W[0], input, 16); for(u32bit j = 16; j != 80; j += 8) { diff --git a/src/hash/sha2/sha2_32.cpp b/src/hash/sha2/sha2_32.cpp index a18a4d8c4..acd06061e 100644 --- a/src/hash/sha2/sha2_32.cpp +++ b/src/hash/sha2/sha2_32.cpp @@ -56,7 +56,7 @@ void sha2_32_compress(MemoryRegion<u32bit>& W, for(u32bit i = 0; i != blocks; ++i) { - load_be(W.begin(), input, 16); + load_be(&W[0], input, 16); for(u32bit j = 16; j != 64; j += 8) { diff --git a/src/hash/sha2/sha2_64.cpp b/src/hash/sha2/sha2_64.cpp index aecf9a0db..5ca78173c 100644 --- a/src/hash/sha2/sha2_64.cpp +++ b/src/hash/sha2/sha2_64.cpp @@ -55,7 +55,7 @@ void sha2_64_compress(MemoryRegion<u64bit>& W, for(u32bit i = 0; i != blocks; ++i) { - load_be(W.begin(), input, 16); + load_be(&W[0], input, 16); for(u32bit j = 16; j != 80; j += 8) { diff --git a/src/hash/skein/skein_512.cpp b/src/hash/skein/skein_512.cpp index 1fdd9fbf6..dabaa5da2 100644 --- a/src/hash/skein/skein_512.cpp +++ b/src/hash/skein/skein_512.cpp @@ -240,7 +240,7 @@ void Skein_512::final_result(byte out[]) { const u32bit to_proc = std::min<u32bit>(out_bytes, 64); - H_out.copy(H.begin(), 8); + H_out.copy(&H[0], 8); reset_tweak(T, SKEIN_OUTPUT, true); ubi_512(H_out, T, counter, sizeof(counter)); diff --git a/src/hash/tiger/tiger.cpp b/src/hash/tiger/tiger.cpp index 1812abf12..dd41841c9 100644 --- a/src/hash/tiger/tiger.cpp +++ b/src/hash/tiger/tiger.cpp @@ -38,7 +38,7 @@ void Tiger::compress_n(const byte input[], u32bit blocks) for(u32bit i = 0; i != blocks; ++i) { - load_le(X.begin(), input, X.size()); + load_le(&X[0], input, X.size()); pass(A, B, C, X, 5); mix(X); pass(C, A, B, X, 7); mix(X); diff --git a/src/hash/whirlpool/whrlpool.cpp b/src/hash/whirlpool/whrlpool.cpp index 6f62695c8..fcd244ce2 100644 --- a/src/hash/whirlpool/whrlpool.cpp +++ b/src/hash/whirlpool/whrlpool.cpp @@ -25,7 +25,7 @@ void Whirlpool::compress_n(const byte in[], u32bit blocks) for(u32bit i = 0; i != blocks; ++i) { - load_be(M.begin(), in, M.size()); + load_be(&M[0], in, M.size()); u64bit K0, K1, K2, K3, K4, K5, K6, K7; K0 = digest[0]; K1 = digest[1]; K2 = digest[2]; K3 = digest[3]; |