hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix test cases for Release builds: The -O3 optimization step seems to cause segfaults on implicit integer overflows, so make the wanted overflows explicit in FakeAuthenticatedCipher.

Browse Source
This commit is contained in:
Sebastian Messmer 2016-02-15 05:00:30 +01:00
parent d3aa06de18
commit 2347782f6a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/cpp-utils/crypto/symmetric/testutils/FakeAuthenticatedCipher.h
View File

@ -90,14 +90,14 @@ namespace cpputils {
private: private:
static int32_t _parity(const byte *data, unsigned int size) { static int32_t _parity(const byte *data, unsigned int size) {
int32_t parity = 34343435; // some init value int32_t parity = 34343435; // some init value
int32_t *intData = (int32_t *) data; const int32_t *intData = reinterpret_cast<const int32_t *>(data);
unsigned int intSize = size / sizeof(int32_t); unsigned int intSize = size / sizeof(int32_t);
for (unsigned int i = 0; i < intSize; ++i) { for (unsigned int i = 0; i < intSize; ++i) {
parity += intData[i]; parity = ((int64_t)parity) + intData[i];
} }
unsigned int remainingBytes = size - 4 * intSize; unsigned int remainingBytes = size - 4 * intSize;
for (unsigned int i = 0; i < remainingBytes; ++i) { for (unsigned int i = 0; i < remainingBytes; ++i) {
parity += (data[4 * intSize + i] << (24 - 8 * i)); parity = ((int64_t)parity) + (data[4 * intSize + i] << (24 - 8 * i));
} }
return parity; return parity;
} }