Adam Ierymenko 4 years ago
parent
commit
00714f5f2e
2 changed files with 5 additions and 7 deletions
  1. 5 2
      core/AES.hpp
  2. 0 5
      core/Protocol.hpp

+ 5 - 2
core/AES.hpp

@@ -27,6 +27,10 @@
 #define ZT_AES_NEON 1
 #endif
 
+#ifndef ZT_INLINE
+#define ZT_INLINE inline
+#endif
+
 namespace ZeroTier {
 
 /**
@@ -372,9 +376,8 @@ public:
 		 */
 		ZT_INLINE void finish1() noexcept
 		{
-			uint64_t tmp[2];
-
 			// Compute 128-bit GMAC tag.
+			uint64_t tmp[2];
 			_gmac.finish(reinterpret_cast<uint8_t *>(tmp));
 
 			// Shorten to 64 bits, concatenate with message IV, and encrypt with AES to

+ 0 - 5
core/Protocol.hpp

@@ -183,11 +183,6 @@
  */
 #define ZT_PROTO_PACKET_FRAGMENT_INDICATOR 0xff
 
-/**
- * Length of a probe packet
- */
-#define ZT_PROTO_PROBE_LENGTH 4
-
 /**
  * Index at which packet fragment payload starts
  */