This commit is contained in:
Adam Ierymenko 2020-10-08 19:03:46 -04:00
parent d20470d30f
commit 00714f5f2e
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
2 changed files with 5 additions and 7 deletions

View file

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

View file

@ -183,11 +183,6 @@
*/ */
#define ZT_PROTO_PACKET_FRAGMENT_INDICATOR 0xff #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 * Index at which packet fragment payload starts
*/ */