From c6141ffbc7e31d2cce6c9738c57d73912fe51645 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Thu, 5 Sep 2019 18:06:48 -0700
Subject: [PATCH] cleanup

---
 node/AES.hpp | 16 +++++-----------
 selftest.cpp |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/node/AES.hpp b/node/AES.hpp
index be5abe799..4792cc8aa 100644
--- a/node/AES.hpp
+++ b/node/AES.hpp
@@ -539,11 +539,6 @@ private:
 	c7 = _mm_aesenc_si128(c7,k)
 
 		while (len >= 128) {
-			_mm_prefetch(in,_MM_HINT_T0);
-			_mm_prefetch(in + 32,_MM_HINT_T0);
-			_mm_prefetch(in + 64,_MM_HINT_T0);
-			_mm_prefetch(in + 96,_MM_HINT_T0);
-			_mm_prefetch(in + 128,_MM_HINT_T0);
 			__m128i c0 = _mm_xor_si128(_mm_set_epi64((__m64)Utils::hton(ctr),iv0),_k.ni.k[0]);
 			__m128i c1 = _mm_xor_si128(_mm_set_epi64((__m64)Utils::hton((uint64_t)(ctr+1ULL)),iv0),_k.ni.k[0]);
 			__m128i c2 = _mm_xor_si128(_mm_set_epi64((__m64)Utils::hton((uint64_t)(ctr+2ULL)),iv0),_k.ni.k[0]);
@@ -667,10 +662,10 @@ 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
 	{
-		const __m128i *ab = (const __m128i *)in;
-		unsigned int blocks = len / 16;
-		unsigned int pblocks = blocks - (blocks % 4);
-		unsigned int rem = len % 16;
+		const __m128i *const ab = (const __m128i *)in;
+		const unsigned int blocks = len / 16;
+		const unsigned int pblocks = blocks - (blocks % 4);
+		const unsigned int rem = len % 16;
 
 		const __m128i shuf = _mm_set_epi8(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15);
 		__m128i y = _mm_setzero_si128();
@@ -681,7 +676,6 @@ private:
 			__m128i d3 = _mm_shuffle_epi8(_mm_loadu_si128(ab + i + 2),shuf);
 			__m128i d4 = _mm_shuffle_epi8(_mm_loadu_si128(ab + i + 3),shuf);
 			_mm_prefetch(ab + i + 4,_MM_HINT_T0);
-			_mm_prefetch(ab + i + 6,_MM_HINT_T0);
 			__m128i t0 = _mm_clmulepi64_si128(_k.ni.hhhh,d1,0x00);
 			__m128i t1 = _mm_clmulepi64_si128(_k.ni.hhh,d2,0x00);
 			__m128i t2 = _mm_clmulepi64_si128(_k.ni.hh,d3,0x00);
@@ -753,7 +747,7 @@ private:
 			t6 = _mm_xor_si128(t6,t3);
 			y = _mm_shuffle_epi8(t6,shuf);
 		}
-#undef h1
+
 		for (;i<blocks;++i)
 			y = _ghash_aesni(shuf,_k.ni.h,y,_mm_loadu_si128(ab + i));
 
diff --git a/selftest.cpp b/selftest.cpp
index 590354778..fed229aaa 100644
--- a/selftest.cpp
+++ b/selftest.cpp
@@ -222,7 +222,7 @@ static int testCrypto()
 			std::cout << (((double)(500000 * ZT_DEFAULT_MTU) / 1048576.0) / ((double)(end - start) / 1000.0)) << " MiB/second (dummy: " << (unsigned int)*dummy << ")" ZT_EOL_S;
 		}
 		{
-			std::cout << "  AES-256-GMAC-CTR (benchmark): "; std::cout.flush();
+			std::cout << "  AES-256-GMAC-SIV (benchmark): "; std::cout.flush();
 			AES k1,k2,k3,k4;
 			AES::initGmacCtrKeys(AES_TEST_VECTOR_0_KEY,k1,k2,k3,k4);
 			int64_t start = OSUtils::now();