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

Use PtrSub to subtract offset from pointer

pull/703/head
Jeffrey Walton 2018-08-15 03:16:08 -04:00
parent 1253bccf06
commit c26aad8a25
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
adv-simd.h
View File

@ -291,9 +291,9 @@ inline size_t AdvancedProcessBlocks64_6x2_NEON(F2 func2, F6 func6,
inIncrement += inIncrement ? blockSize : 0; inIncrement += inIncrement ? blockSize : 0;
xorIncrement += xorIncrement ? blockSize : 0; xorIncrement += xorIncrement ? blockSize : 0;
outIncrement += outIncrement ? blockSize : 0; outIncrement += outIncrement ? blockSize : 0;
inBlocks -= inIncrement; inBlocks = PtrAdd(inBlocks, inIncrement);
xorBlocks -= xorIncrement; xorBlocks = PtrSub(xorBlocks, xorIncrement);
outBlocks -= outIncrement; outBlocks = PtrSub(outBlocks, outIncrement);
} }
else else
{ {
@ -981,9 +981,9 @@ inline size_t AdvancedProcessBlocks64_2x1_SSE(F1 func1, F2 func2,
inIncrement += inIncrement ? blockSize : 0; inIncrement += inIncrement ? blockSize : 0;
xorIncrement += xorIncrement ? blockSize : 0; xorIncrement += xorIncrement ? blockSize : 0;
outIncrement += outIncrement ? blockSize : 0; outIncrement += outIncrement ? blockSize : 0;
inBlocks -= inIncrement; inBlocks = PtrSub(inBlocks, inIncrement);
xorBlocks -= xorIncrement; xorBlocks = PtrSub(xorBlocks, xorIncrement);
outBlocks -= outIncrement; outBlocks = PtrSub(outBlocks, outIncrement);
} }
else else
{ {
@ -1229,9 +1229,9 @@ inline size_t AdvancedProcessBlocks64_6x2_SSE(F2 func2, F6 func6,
inIncrement += inIncrement ? blockSize : 0; inIncrement += inIncrement ? blockSize : 0;
xorIncrement += xorIncrement ? blockSize : 0; xorIncrement += xorIncrement ? blockSize : 0;
outIncrement += outIncrement ? blockSize : 0; outIncrement += outIncrement ? blockSize : 0;
inBlocks -= inIncrement; inBlocks = PtrSub(inBlocks, inIncrement);
xorBlocks -= xorIncrement; xorBlocks = PtrSub(xorBlocks, xorIncrement);
outBlocks -= outIncrement; outBlocks = PtrSub(outBlocks, outIncrement);
} }
else else
{ {
@ -1731,9 +1731,9 @@ inline size_t AdvancedProcessBlocks64_4x1_SSE(F1 func1, F4 func4,
inIncrement += inIncrement ? blockSize : 0; inIncrement += inIncrement ? blockSize : 0;
xorIncrement += xorIncrement ? blockSize : 0; xorIncrement += xorIncrement ? blockSize : 0;
outIncrement += outIncrement ? blockSize : 0; outIncrement += outIncrement ? blockSize : 0;
inBlocks -= inIncrement; inBlocks = PtrSub(inBlocks, inIncrement);
xorBlocks -= xorIncrement; xorBlocks = PtrSub(xorBlocks, xorIncrement);
outBlocks -= outIncrement; outBlocks = PtrSub(outBlocks, outIncrement);
} }
else else
{ {
@ -1797,7 +1797,7 @@ NAMESPACE_BEGIN(CryptoPP)
/// \details The subkey type is usually word32 or word64. F2 and F6 must use the /// \details The subkey type is usually word32 or word64. F2 and F6 must use the
/// same word type. /// same word type.
template <typename F2, typename F6, typename W> template <typename F2, typename F6, typename W>
inline size_t AdvancedProcessBlocks64_6x2_ALTIVEC(F2 func2, F6 func6, size_t AdvancedProcessBlocks64_6x2_ALTIVEC(F2 func2, F6 func6,
const W *subKeys, size_t rounds, const byte *inBlocks, const W *subKeys, size_t rounds, const byte *inBlocks,
const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags)
{ {
@ -2001,9 +2001,9 @@ inline size_t AdvancedProcessBlocks64_6x2_ALTIVEC(F2 func2, F6 func6,
inIncrement += inIncrement ? blockSize : 0; inIncrement += inIncrement ? blockSize : 0;
xorIncrement += xorIncrement ? blockSize : 0; xorIncrement += xorIncrement ? blockSize : 0;
outIncrement += outIncrement ? blockSize : 0; outIncrement += outIncrement ? blockSize : 0;
inBlocks -= inIncrement; inBlocks = PtrSub(inBlocks, inIncrement);
xorBlocks -= xorIncrement; xorBlocks = PtrSub(xorBlocks, xorIncrement);
outBlocks -= outIncrement; outBlocks = PtrSub(outBlocks, outIncrement);
} }
else else
{ {
@ -2125,14 +2125,7 @@ inline size_t AdvancedProcessBlocks128_4x1_ALTIVEC(F1 func1, F4 func4,
// located at index 15. The vector addition using a 32-bit element // located at index 15. The vector addition using a 32-bit element
// generates a carry into inBlocks[14] and then CTR_ModePolicy // generates a carry into inBlocks[14] and then CTR_ModePolicy
// increments inBlocks[14] too. // increments inBlocks[14] too.
// const_cast<byte*>(inBlocks)[15] += 6;
// To find this bug we needed a test case with a ctr of 0xNN...FA.
// The last octet is 0xFA and adding 6 creates the wrap to trigger
// the issue. If the last octet was 0xFC then 4 would trigger it.
// We dumb-lucked into the test with SPECK-128. The test case of
// interest is the one with IV 348ECA9766C09F04 826520DE47A212FA.
uint8x16_p temp = VectorAdd((uint8x16_p)block3, (uint8x16_p)s_one);
VectorStoreBE(temp, const_cast<byte*>(inBlocks));
} }
else else
{ {