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

Increase use of ptrdiff_t when performing pointer math

pull/687/head
Jeffrey Walton 2018-07-12 09:48:46 -04:00
parent ed143608a8
commit 40d70375a9
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
strciphr.cpp
View File

@ -59,8 +59,8 @@ void AdditiveCipherTemplate<S>::GenerateBlock(byte *outString, size_t length)
size_t bufferByteSize = RoundUpToMultipleOf(length, bytesPerIteration); size_t bufferByteSize = RoundUpToMultipleOf(length, bytesPerIteration);
size_t bufferIterations = bufferByteSize / bytesPerIteration; size_t bufferIterations = bufferByteSize / bytesPerIteration;
policy.WriteKeystream(KeystreamBufferEnd()-bufferByteSize, bufferIterations); policy.WriteKeystream(PtrSub(KeystreamBufferEnd(), bufferByteSize), bufferIterations);
memcpy(outString, KeystreamBufferEnd()-bufferByteSize, length); memcpy(outString, PtrSub(KeystreamBufferEnd(), bufferByteSize), length);
m_leftOver = bufferByteSize - length; m_leftOver = bufferByteSize - length;
} }
} }
@ -115,8 +115,8 @@ void AdditiveCipherTemplate<S>::ProcessData(byte *outString, const byte *inStrin
bufferByteSize = RoundUpToMultipleOf(length, bytesPerIteration); bufferByteSize = RoundUpToMultipleOf(length, bytesPerIteration);
bufferIterations = bufferByteSize / bytesPerIteration; bufferIterations = bufferByteSize / bytesPerIteration;
policy.WriteKeystream(KeystreamBufferEnd()-bufferByteSize, bufferIterations); policy.WriteKeystream(PtrSub(KeystreamBufferEnd(), bufferByteSize), bufferIterations);
xorbuf(outString, inString, KeystreamBufferEnd()-bufferByteSize, length); xorbuf(outString, inString, PtrSub(KeystreamBufferEnd(), bufferByteSize), length);
m_leftOver = bufferByteSize - length; m_leftOver = bufferByteSize - length;
} }
} }
@ -141,7 +141,7 @@ void AdditiveCipherTemplate<BASE>::Seek(lword position)
if (position > 0) if (position > 0)
{ {
policy.WriteKeystream(KeystreamBufferEnd()-bytesPerIteration, 1); policy.WriteKeystream(PtrSub(KeystreamBufferEnd(), bytesPerIteration), 1);
m_leftOver = bytesPerIteration - (unsigned int)position; m_leftOver = bytesPerIteration - (unsigned int)position;
} }
else else