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

Revert "Some fixes related to SunCC compiler bugs." 

This reverts commit 72d8cbe917.
pull/405/head
Anton Gorev 2017-04-27 13:50:47 -05:00
parent 2297dd000a
commit 1df5fc1e21
3 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sha.cpp
View File

@ -40,21 +40,7 @@ typedef void (CRYPTOPP_FASTCALL *pfnSHAHashBlocks)(word32 *state, const word32 *
// start of Steve Reid's code // // start of Steve Reid's code //
//////////////////////////////// ////////////////////////////////
template <typename T>
inline T BLK0_TEMPLATE(const T* y, const int i)
{
T t;
memcpy(&t, y+i, sizeof(t));
return t;
}
#if defined(__SUNPRO_CC)
# define blk0(i) (W[i] = BLK0_TEMPLATE(data,i))
#else
#define blk0(i) (W[i] = data[i]) #define blk0(i) (W[i] = data[i])
#endif
#define blk1(i) (W[i&15] = rotlFixed(W[(i+13)&15]^W[(i+8)&15]^W[(i+2)&15]^W[i&15],1)) #define blk1(i) (W[i&15] = rotlFixed(W[(i+13)&15]^W[(i+8)&15]^W[(i+2)&15]^W[i&15],1))
#define f1(x,y,z) (z^(x&(y^z))) #define f1(x,y,z) (z^(x&(y^z)))

18
vmac.cpp
View File

@ -546,23 +546,9 @@ void VMAC_Base::VHASH_Update_Template(const word64 *data, size_t blocksRemaining
CRYPTOPP_ASSERT(IsAlignedOn(m_polyState(),GetAlignmentOf<word64>())); CRYPTOPP_ASSERT(IsAlignedOn(m_polyState(),GetAlignmentOf<word64>()));
CRYPTOPP_ASSERT(IsAlignedOn(m_nhKey(),GetAlignmentOf<word64>())); CRYPTOPP_ASSERT(IsAlignedOn(m_nhKey(),GetAlignmentOf<word64>()));
#if defined(__SUNPRO_CC)
#define PREPARE_D0_D1(j) \
word64 d0_original = 0;\
memcpy(&d0_original, data + i + 2*j + 0, sizeof(d0_original));\
word64 d1_original = 0;\
memcpy(&d1_original, data + i + 2*j + 1, sizeof(d1_original));\
\
word64 d0 = ConditionalByteReverse(LITTLE_ENDIAN_ORDER, d0_original);\
word64 d1 = ConditionalByteReverse(LITTLE_ENDIAN_ORDER, d1_original)
#else
#define PREPARE_D0_D1(j) \
word64 d0 = ConditionalByteReverse(LITTLE_ENDIAN_ORDER, data[i+2*j+0]);\
word64 d1 = ConditionalByteReverse(LITTLE_ENDIAN_ORDER, data[i+2*j+1])
#endif
#define INNER_LOOP_ITERATION(j) {\ #define INNER_LOOP_ITERATION(j) {\
PREPARE_D0_D1(j);\ word64 d0 = ConditionalByteReverse(LITTLE_ENDIAN_ORDER, data[i+2*j+0]);\
word64 d1 = ConditionalByteReverse(LITTLE_ENDIAN_ORDER, data[i+2*j+1]);\
AccumulateNH(nhA, d0+nhK[i+2*j+0], d1+nhK[i+2*j+1]);\ AccumulateNH(nhA, d0+nhK[i+2*j+0], d1+nhK[i+2*j+1]);\
if (T_128BitTag)\ if (T_128BitTag)\
AccumulateNH(nhB, d0+nhK[i+2*j+2], d1+nhK[i+2*j+3]);\ AccumulateNH(nhB, d0+nhK[i+2*j+2], d1+nhK[i+2*j+3]);\

8
whrlpool.cpp
View File

@ -609,15 +609,7 @@ void Whirlpool::Transform(word64 *digest, const word64 *block)
// Compute and apply K^0 to the cipher state // Compute and apply K^0 to the cipher state
// Also apply part of the Miyaguchi-Preneel compression function // Also apply part of the Miyaguchi-Preneel compression function
for (int i=0; i<8; i++) for (int i=0; i<8; i++)
{
#if defined (__SUNPRO_CC)
word64 block_i = 0;
memcpy(&block_i, &block[i], sizeof(block_i));
digest[i] = s[i] = block_i ^ (k[i] = digest[i]);
#else
digest[i] = s[i] = block[i] ^ (k[i] = digest[i]); digest[i] = s[i] = block[i] ^ (k[i] = digest[i]);
#endif
}
#define KSL(op, i, a, b, c, d) \ #define KSL(op, i, a, b, c, d) \
t = (word32)k[i];\ t = (word32)k[i];\