mirror of
https://github.com/AuxXxilium/synology-wireguard.git
synced 2024-11-23 23:11:06 +07:00
85 lines
3.0 KiB
Diff
85 lines
3.0 KiB
Diff
|
--- a/src/compat/siphash/siphash.c
|
||
|
|
+++ b/src/compat/siphash/siphash.c
|
||
|
|
@@ -77,11 +77,11 @@ u64 __siphash_aligned(const void *data, size_t len, const siphash_key_t *key)
|
||
|
|
bytemask_from_count(left)));
|
||
|
|
#else
|
||
|
|
switch (left) {
|
||
|
|
- case 7: b |= ((u64)end[6]) << 48; fallthrough;
|
||
|
|
- case 6: b |= ((u64)end[5]) << 40; fallthrough;
|
||
|
|
- case 5: b |= ((u64)end[4]) << 32; fallthrough;
|
||
|
|
+ case 7: b |= ((u64)end[6]) << 48;
|
||
|
|
+ case 6: b |= ((u64)end[5]) << 40;
|
||
|
|
+ case 5: b |= ((u64)end[4]) << 32;
|
||
|
|
case 4: b |= le32_to_cpup(data); break;
|
||
|
|
- case 3: b |= ((u64)end[2]) << 16; fallthrough;
|
||
|
|
+ case 3: b |= ((u64)end[2]) << 16;
|
||
|
|
case 2: b |= le16_to_cpup(data); break;
|
||
|
|
case 1: b |= end[0];
|
||
|
|
}
|
||
|
|
@@ -109,11 +109,11 @@ u64 __siphash_unaligned(const void *data, size_t len, const siphash_key_t *key)
|
||
|
|
bytemask_from_count(left)));
|
||
|
|
#else
|
||
|
|
switch (left) {
|
||
|
|
- case 7: b |= ((u64)end[6]) << 48; fallthrough;
|
||
|
|
- case 6: b |= ((u64)end[5]) << 40; fallthrough;
|
||
|
|
- case 5: b |= ((u64)end[4]) << 32; fallthrough;
|
||
|
|
+ case 7: b |= ((u64)end[6]) << 48;
|
||
|
|
+ case 6: b |= ((u64)end[5]) << 40;
|
||
|
|
+ case 5: b |= ((u64)end[4]) << 32;
|
||
|
|
case 4: b |= get_unaligned_le32(end); break;
|
||
|
|
- case 3: b |= ((u64)end[2]) << 16; fallthrough;
|
||
|
|
+ case 3: b |= ((u64)end[2]) << 16;
|
||
|
|
case 2: b |= get_unaligned_le16(end); break;
|
||
|
|
case 1: b |= end[0];
|
||
|
|
}
|
||
|
|
@@ -269,11 +269,11 @@ u32 __hsiphash_aligned(const void *data, size_t len, const hsiphash_key_t *key)
|
||
|
|
bytemask_from_count(left)));
|
||
|
|
#else
|
||
|
|
switch (left) {
|
||
|
|
- case 7: b |= ((u64)end[6]) << 48; fallthrough;
|
||
|
|
- case 6: b |= ((u64)end[5]) << 40; fallthrough;
|
||
|
|
- case 5: b |= ((u64)end[4]) << 32; fallthrough;
|
||
|
|
+ case 7: b |= ((u64)end[6]) << 48;
|
||
|
|
+ case 6: b |= ((u64)end[5]) << 40;
|
||
|
|
+ case 5: b |= ((u64)end[4]) << 32;
|
||
|
|
case 4: b |= le32_to_cpup(data); break;
|
||
|
|
- case 3: b |= ((u64)end[2]) << 16; fallthrough;
|
||
|
|
+ case 3: b |= ((u64)end[2]) << 16;
|
||
|
|
case 2: b |= le16_to_cpup(data); break;
|
||
|
|
case 1: b |= end[0];
|
||
|
|
}
|
||
|
|
@@ -301,11 +301,11 @@ u32 __hsiphash_unaligned(const void *data, size_t len,
|
||
|
|
bytemask_from_count(left)));
|
||
|
|
#else
|
||
|
|
switch (left) {
|
||
|
|
- case 7: b |= ((u64)end[6]) << 48; fallthrough;
|
||
|
|
- case 6: b |= ((u64)end[5]) << 40; fallthrough;
|
||
|
|
- case 5: b |= ((u64)end[4]) << 32; fallthrough;
|
||
|
|
+ case 7: b |= ((u64)end[6]) << 48;
|
||
|
|
+ case 6: b |= ((u64)end[5]) << 40;
|
||
|
|
+ case 5: b |= ((u64)end[4]) << 32;
|
||
|
|
case 4: b |= get_unaligned_le32(end); break;
|
||
|
|
- case 3: b |= ((u64)end[2]) << 16; fallthrough;
|
||
|
|
+ case 3: b |= ((u64)end[2]) << 16;
|
||
|
|
case 2: b |= get_unaligned_le16(end); break;
|
||
|
|
case 1: b |= end[0];
|
||
|
|
}
|
||
|
|
@@ -426,7 +426,7 @@ u32 __hsiphash_aligned(const void *data, size_t len, const hsiphash_key_t *key)
|
||
|
|
v0 ^= m;
|
||
|
|
}
|
||
|
|
switch (left) {
|
||
|
|
- case 3: b |= ((u32)end[2]) << 16; fallthrough;
|
||
|
|
+ case 3: b |= ((u32)end[2]) << 16;
|
||
|
|
case 2: b |= le16_to_cpup(data); break;
|
||
|
|
case 1: b |= end[0];
|
||
|
|
}
|
||
|
|
@@ -448,7 +448,7 @@ u32 __hsiphash_unaligned(const void *data, size_t len,
|
||
|
|
v0 ^= m;
|
||
|
|
}
|
||
|
|
switch (left) {
|
||
|
|
- case 3: b |= ((u32)end[2]) << 16; fallthrough;
|
||
|
|
+ case 3: b |= ((u32)end[2]) << 16;
|
||
|
|
case 2: b |= get_unaligned_le16(end); break;
|
||
|
|
case 1: b |= end[0];
|
||
|
|
}
|