denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unit-tests: Fix internet checksum tests on big-endian systems

Browse Source 
We actually need to do a byte-swap, which ntohs() only does on
little-endian systems.

Fixes #747.
This commit is contained in:
Tobias Brunner
2014-10-23 11:13:54 +02:00
parent eb218ff80b
commit e7c582e652
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/tests/suites/test_chunk.c
+9 -4
View File
@@ -787,6 +787,11 @@ END_TEST
* test for chunk_internet_checksum[_inc]() * test for chunk_internet_checksum[_inc]()
*/ */
static inline u_int16_t compensate_alignment(u_int16_t val)
{
return ((val & 0xff) << 8) | (val >> 8);
}
START_TEST(test_chunk_internet_checksum) START_TEST(test_chunk_internet_checksum)
{ {
chunk_t chunk; chunk_t chunk;
@@ -804,9 +809,9 @@ START_TEST(test_chunk_internet_checksum)
/* need to compensate for even/odd alignment */ /* need to compensate for even/odd alignment */
sum = chunk_internet_checksum(chunk_create(chunk.ptr, 9)); sum = chunk_internet_checksum(chunk_create(chunk.ptr, 9));
sum = ntohs(sum); sum = compensate_alignment(sum);
sum = chunk_internet_checksum_inc(chunk_create(chunk.ptr+9, 11), sum); sum = chunk_internet_checksum_inc(chunk_create(chunk.ptr+9, 11), sum);
sum = ntohs(sum); sum = compensate_alignment(sum);
ck_assert_int_eq(0x442e, ntohs(sum)); ck_assert_int_eq(0x442e, ntohs(sum));
chunk = chunk_from_chars(0x45,0x00,0x00,0x30,0x44,0x22,0x40,0x00,0x80,0x06, chunk = chunk_from_chars(0x45,0x00,0x00,0x30,0x44,0x22,0x40,0x00,0x80,0x06,
@@ -821,9 +826,9 @@ START_TEST(test_chunk_internet_checksum)
/* need to compensate for even/odd alignment */ /* need to compensate for even/odd alignment */
sum = chunk_internet_checksum(chunk_create(chunk.ptr, 9)); sum = chunk_internet_checksum(chunk_create(chunk.ptr, 9));
sum = ntohs(sum); sum = compensate_alignment(sum);
sum = chunk_internet_checksum_inc(chunk_create(chunk.ptr+9, 10), sum); sum = chunk_internet_checksum_inc(chunk_create(chunk.ptr+9, 10), sum);
sum = ntohs(sum); sum = compensate_alignment(sum);
ck_assert_int_eq(0x4459, ntohs(sum)); ck_assert_int_eq(0x4459, ntohs(sum));
} }
END_TEST END_TEST