dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/zerotier/ZeroTierOne into dev

Browse source
This commit is contained in:
Joseph Henry 2020-10-14 18:40:38 -07:00
commit fd7f61bab7
36 changed files with 5699 additions and 2117 deletions
Download patch file Download diff file Expand all files Collapse all files

9
node/AES.cpp
View file

@ -18,10 +18,6 @@
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
#ifdef __APPLE__
#include <arm_neon.h>
#endif
#define Te1_r(x) ZT_ROR32(Te0[x], 8U)
#define Te2_r(x) ZT_ROR32(Te0[x], 16U)
#define Te3_r(x) ZT_ROR32(Te0[x], 24U)
@ -150,6 +146,7 @@ void s_gfmul(const uint64_t hh, const uint64_t hl, uint64_t &y0, uint64_t &y1) n
// SSE shuffle parameter to reverse bytes in a 128-bit vector.
static const __m128i s_sseSwapBytes = _mm_set_epi8(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
__attribute__((__target__("ssse3,sse4,sse4.1,sse4.2")))
static __m128i p_gmacPCLMUL128(const __m128i h, __m128i y) noexcept
{
y = _mm_shuffle_epi8(y, s_sseSwapBytes);
@ -173,6 +170,7 @@ static __m128i p_gmacPCLMUL128(const __m128i h, __m128i y) noexcept
#endif
__attribute__((__target__("ssse3,sse4,sse4.1,sse4.2")))
void AES::GMAC::update(const void *const data, unsigned int len) noexcept
{
const uint8_t *in = reinterpret_cast<const uint8_t *>(data);
@ -326,6 +324,7 @@ void AES::GMAC::update(const void *const data, unsigned int len) noexcept
_rp = len; // len is always less than 16 here
}
__attribute__((__target__("ssse3,sse4,sse4.1,sse4.2")))
void AES::GMAC::finish(uint8_t tag[16]) noexcept
{
#ifdef ZT_AES_AESNI
@ -597,6 +596,7 @@ void p_aesCtrInnerVAES256(unsigned int &len, const uint64_t c0, uint64_t &c1, co
#endif // ZT_AES_AESNI
__attribute__((__target__("ssse3,sse4,sse4.1,sse4.2")))
void AES::CTR::crypt(const void *const input, unsigned int len) noexcept
{
const uint8_t *in = reinterpret_cast<const uint8_t *>(input);
@ -1477,6 +1477,7 @@ static __m128i _init256_2_aesni(__m128i a, __m128i b) noexcept
return x;
}
__attribute__((__target__("ssse3,sse4,sse4.1,sse4.2")))
void AES::_init_aesni(const uint8_t key[32]) noexcept
{
__m128i t1, t2, k1, k2, k3, k4, k5, k6, k7, k8, k9, k10, k11, k12, k13;

2
node/Constants.hpp
View file

@ -111,8 +111,6 @@
#include <mmintrin.h>
#endif
#if (defined(__ARM_NEON) || defined(__ARM_NEON__) || defined(ZT_ARCH_ARM_HAS_NEON))
#if (defined(__APPLE__) && !defined(__LP64__)) || (defined(__ANDROID__) && defined(__arm__))
#ifdef ZT_ARCH_ARM_HAS_NEON

15
node/Path.hpp
View file

@ -184,7 +184,8 @@ public:
*
* @param t Time of receive
*/
inline void received(const uint64_t t) {
inline void received(const uint64_t t)
{
if (!alive(t,_bonded)) {
_lastAliveToggle = _lastIn;
}
@ -311,15 +312,9 @@ public:
*/
inline long quality(const int64_t now) const
{
const long l = (long)_latency;
const long age = (long)std::min((now - _lastIn),(int64_t)(ZT_PATH_HEARTBEAT_PERIOD * 10)); // set an upper sanity limit to avoid overflow
return (
(
(age < (long)(ZT_PATH_HEARTBEAT_PERIOD + 5000)) ? l : (l + 0xffff + age)
) * (
((long)ZT_INETADDRESS_MAX_SCOPE - (long)_ipScope) + (_addr.isV6() ? (long)1 : (long)3)
)
);
const int l = (long)_latency;
const int age = (long)std::min((now - _lastIn),(int64_t)(ZT_PATH_HEARTBEAT_PERIOD * 10)); // set an upper sanity limit to avoid overflow
return (((age < (ZT_PATH_HEARTBEAT_PERIOD + 5000)) ? l : (l + 0xffff + age)) * (long)((ZT_INETADDRESS_MAX_SCOPE - _ipScope) + 1));
}
/**