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

cleanup

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

25
node/AES.hpp
View file

@ -141,13 +141,14 @@ public:
// the 64-bit supplied IV and the message size. // the 64-bit supplied IV and the message size.
#ifdef ZT_NO_TYPE_PUNNING #ifdef ZT_NO_TYPE_PUNNING
for(unsigned int i=0;i<8;++i) gmacIv[i] = iv[i]; for(unsigned int i=0;i<8;++i) gmacIv[i] = iv[i];
#else
*((uint64_t *)gmacIv) = *((const uint64_t *)iv);
#endif
gmacIv[8] = (uint8_t)(len >> 24); gmacIv[8] = (uint8_t)(len >> 24);
gmacIv[9] = (uint8_t)(len >> 16); gmacIv[9] = (uint8_t)(len >> 16);
gmacIv[10] = (uint8_t)(len >> 8); gmacIv[10] = (uint8_t)(len >> 8);
gmacIv[11] = (uint8_t)len; gmacIv[11] = (uint8_t)len;
#else
*((uint64_t *)gmacIv) = *((const uint64_t *)iv);
*((uint32_t *)(gmacIv + 8)) = Utils::hton((uint32_t)len);
#endif
gmac(gmacIv,in,len,ctrIv); gmac(gmacIv,in,len,ctrIv);
// (2) The first 64 bits of GMAC output are the auth tag. Create // (2) The first 64 bits of GMAC output are the auth tag. Create
@ -197,13 +198,14 @@ public:
// GMAC IV built from the message IV and the message size. // GMAC IV built from the message IV and the message size.
#ifdef ZT_NO_TYPE_PUNNING #ifdef ZT_NO_TYPE_PUNNING
for(unsigned int i=0;i<8;++i) gmacIv[i] = iv[i]; for(unsigned int i=0;i<8;++i) gmacIv[i] = iv[i];
#else
*((uint64_t *)gmacIv) = *((const uint64_t *)iv);
#endif
gmacIv[8] = (uint8_t)(len >> 24); gmacIv[8] = (uint8_t)(len >> 24);
gmacIv[9] = (uint8_t)(len >> 16); gmacIv[9] = (uint8_t)(len >> 16);
gmacIv[10] = (uint8_t)(len >> 8); gmacIv[10] = (uint8_t)(len >> 8);
gmacIv[11] = (uint8_t)len; gmacIv[11] = (uint8_t)len;
#else
*((uint64_t *)gmacIv) = *((const uint64_t *)iv);
*((uint32_t *)(gmacIv + 8)) = Utils::hton((uint32_t)len);
#endif
gmac(gmacIv,out,len,gmacOut); gmac(gmacIv,out,len,gmacOut);
// (4) Compare first 64 bits of GMAC output with tag. // (4) Compare first 64 bits of GMAC output with tag.
@ -671,17 +673,16 @@ private:
ZT_ALWAYS_INLINE void _gmac_aesni(const uint8_t iv[12],const uint8_t *in,const unsigned int len,uint8_t out[16]) const ZT_ALWAYS_INLINE void _gmac_aesni(const uint8_t iv[12],const uint8_t *in,const unsigned int len,uint8_t out[16]) const
{ {
__m128i h1 = _k.ni.hhhh;
__m128i h2 = _k.ni.hhh;
__m128i h3 = _k.ni.hh;
__m128i h4 = _k.ni.h;
__m128i y = _mm_setzero_si128();
const __m128i *ab = (const __m128i *)in; const __m128i *ab = (const __m128i *)in;
unsigned int blocks = len / 16; unsigned int blocks = len / 16;
unsigned int pblocks = blocks - (blocks % 4); unsigned int pblocks = blocks - (blocks % 4);
unsigned int rem = len % 16; unsigned int rem = len % 16;
__m128i h1 = _k.ni.hhhh;
__m128i h2 = _k.ni.hhh;
__m128i h3 = _k.ni.hh;
__m128i h4 = _k.ni.h;
__m128i y = _mm_setzero_si128();
for (unsigned int i=0;i<pblocks;i+=4) { for (unsigned int i=0;i<pblocks;i+=4) {
__m128i d1 = _mm_loadu_si128(ab + i + 0); __m128i d1 = _mm_loadu_si128(ab + i + 0);
__m128i d2 = _mm_loadu_si128(ab + i + 1); __m128i d2 = _mm_loadu_si128(ab + i + 1);