diff options
author | lloyd <[email protected]> | 2008-09-30 16:43:57 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2008-09-30 16:43:57 +0000 |
commit | eaa047cda3726b1207061ccc4ed707dddb01e3cc (patch) | |
tree | fff99535000fbbbacd70b357075992fe26cbf905 /src | |
parent | 35761fb60dba26fb43926cd3f848c74ebb704f86 (diff) |
Fix prototype confusion (harmless but incorrect)
Diffstat (limited to 'src')
-rw-r--r-- | src/hash/sha1_sse2/sha1_sse2.cpp | 4 | ||||
-rw-r--r-- | src/hash/sha1_sse2/sha1_sse2.h | 2 | ||||
-rw-r--r-- | src/hash/sha1_sse2/sha1_sse2_imp.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/hash/sha1_sse2/sha1_sse2.cpp b/src/hash/sha1_sse2/sha1_sse2.cpp index 36d266dcf..1d47cb1df 100644 --- a/src/hash/sha1_sse2/sha1_sse2.cpp +++ b/src/hash/sha1_sse2/sha1_sse2.cpp @@ -7,14 +7,12 @@ namespace Botan { -extern "C" void botan_sha1_sse2_compress(u32bit[5], const byte[64]); - /************************************************* * SHA-160 Compression Function * *************************************************/ void SHA_160_SSE2::hash(const byte input[]) { - botan_sha1_sse2_compress(digest, input); + botan_sha1_sse2_compress(digest, reinterpret_cast<const u32bit*>(input)); } } diff --git a/src/hash/sha1_sse2/sha1_sse2.h b/src/hash/sha1_sse2/sha1_sse2.h index ecb8fc95d..73b6920b5 100644 --- a/src/hash/sha1_sse2/sha1_sse2.h +++ b/src/hash/sha1_sse2/sha1_sse2.h @@ -22,6 +22,8 @@ class SHA_160_SSE2 : public SHA_160 void hash(const byte[]); }; +extern "C" void botan_sha1_sse2_compress(u32bit[5], const u32bit*); + } #endif diff --git a/src/hash/sha1_sse2/sha1_sse2_imp.cpp b/src/hash/sha1_sse2/sha1_sse2_imp.cpp index 759d88afa..0c48b5de0 100644 --- a/src/hash/sha1_sse2/sha1_sse2_imp.cpp +++ b/src/hash/sha1_sse2/sha1_sse2_imp.cpp @@ -20,7 +20,7 @@ * on a Linux/Core2 system. * */ -#include <botan/types.h> +#include <botan/sha1_sse2.h> #include <xmmintrin.h> namespace Botan { @@ -188,7 +188,7 @@ static inline u32bit f60_79(u32bit x, u32bit y, u32bit z) (xt) += ((xe) + rol((xa), 5)); \ } while(0) -extern "C" void botan_sha1_sse2_compress(u32bit* H, +extern "C" void botan_sha1_sse2_compress(u32bit H[5], const u32bit* inputu) { const __m128i * input = (const __m128i *)inputu; |