void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 21:13:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Adam Ierymenko 2019-08-23 21:12:24 -07:00
parent 5ba6e21967
commit 1d8f3cee62
No known key found for this signature in database
GPG key ID: 1657198823E52A61
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
node/AES.hpp
View file

@ -240,7 +240,7 @@ private:
} ni; } ni;
#endif #endif
struct { struct {
uint32_t ek[60]; uint32_t ek[30];
} sw; } sw;
} _k; } _k;
/**************************************************************************/ /**************************************************************************/
@ -423,7 +423,7 @@ private:
ZT_ALWAYS_INLINE void _crypt_ctr_aesni(const uint8_t iv[16],const uint8_t *in,unsigned int len,uint8_t *out) const ZT_ALWAYS_INLINE void _crypt_ctr_aesni(const uint8_t iv[16],const uint8_t *in,unsigned int len,uint8_t *out) const
{ {
const uint64_t iv0 = *((const uint64_t *)iv); const __m64 iv0 = (__m64)(*((const uint64_t *)iv));
uint64_t ctr = Utils::ntoh(*((const uint64_t *)(iv+8))); uint64_t ctr = Utils::ntoh(*((const uint64_t *)(iv+8)));
const __m128i k0 = _k.ni.k[0]; const __m128i k0 = _k.ni.k[0];
@ -443,10 +443,10 @@ private:
const __m128i k14 = _k.ni.k[14]; const __m128i k14 = _k.ni.k[14];
while (len >= 64) { while (len >= 64) {
__m128i c0 = _mm_xor_si128(_mm_set_epi64((__m64)Utils::hton(ctr),(__m64)iv0),k0); __m128i c0 = _mm_xor_si128(_mm_set_epi64((__m64)Utils::hton(ctr),iv0),k0);
__m128i c1 = _mm_xor_si128(_mm_set_epi64((__m64)Utils::hton(ctr+1ULL),(__m64)iv0),k0); __m128i c1 = _mm_xor_si128(_mm_set_epi64((__m64)Utils::hton(ctr+1ULL),iv0),k0);
__m128i c2 = _mm_xor_si128(_mm_set_epi64((__m64)Utils::hton(ctr+2ULL),(__m64)iv0),k0); __m128i c2 = _mm_xor_si128(_mm_set_epi64((__m64)Utils::hton(ctr+2ULL),iv0),k0);
__m128i c3 = _mm_xor_si128(_mm_set_epi64((__m64)Utils::hton(ctr+3ULL),(__m64)iv0),k0); __m128i c3 = _mm_xor_si128(_mm_set_epi64((__m64)Utils::hton(ctr+3ULL),iv0),k0);
ctr += 4; ctr += 4;
c0 = _mm_aesenc_si128(c0,k1); c0 = _mm_aesenc_si128(c0,k1);
c1 = _mm_aesenc_si128(c1,k1); c1 = _mm_aesenc_si128(c1,k1);