arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix SunCC 12.5 compile with -std=c++11

pull/548/head
Jeffrey Walton 2017-11-13 13:08:56 -05:00
parent 660681a884
commit f1386ad894
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blake2-simd.cpp
View File

@ -50,7 +50,7 @@ NAMESPACE_BEGIN(CryptoPP)
inline __m128i MM_SET_EPI64X(const word64 a, const word64 b) inline __m128i MM_SET_EPI64X(const word64 a, const word64 b)
{ {
const word64 t[2] = {b,a}; __m128i r; const word64 t[2] = {b,a}; __m128i r;
::memcpy(&r, &t, sizeof(t)); ::memcpy(&r, t, sizeof(t));
return r; return r;
} }
#else #else

6
blake2.cpp
View File

@ -46,15 +46,13 @@ struct BLAKE2_IV
static const W iv[8]; static const W iv[8];
}; };
template<> template <>
CRYPTOPP_ALIGN_DATA(16)
const word32 BLAKE2_IV<word32, false>::iv[8] = { const word32 BLAKE2_IV<word32, false>::iv[8] = {
0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL,
0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL
}; };
template<> template <>
CRYPTOPP_ALIGN_DATA(16)
const word64 BLAKE2_IV<word64, true>::iv[8] = { const word64 BLAKE2_IV<word64, true>::iv[8] = {
W64LIT(0x6a09e667f3bcc908), W64LIT(0xbb67ae8584caa73b), W64LIT(0x6a09e667f3bcc908), W64LIT(0xbb67ae8584caa73b),
W64LIT(0x3c6ef372fe94f82b), W64LIT(0xa54ff53a5f1d36f1), W64LIT(0x3c6ef372fe94f82b), W64LIT(0xa54ff53a5f1d36f1),