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

Build fixes.

Browse source
This commit is contained in:
Adam Ierymenko 2021-04-26 18:11:01 -04:00
parent 12e7546ebc
commit 91556d0c55
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/FCV.hpp
View file

@ -15,6 +15,7 @@
#define ZT_FCV_HPP #define ZT_FCV_HPP
#include "Constants.hpp" #include "Constants.hpp"
#include "Utils.hpp"
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>

3
core/MAC.hpp
View file

@ -32,7 +32,8 @@ class MAC : public TriviallyCopyable {
} }
ZT_INLINE ZT_INLINE
MAC(const uint8_t a, const uint8_t b, const uint8_t c, const uint8_t d, const uint8_t e, const uint8_t f) noexcept MAC(const uint8_t a, const uint8_t b, const uint8_t c, const uint8_t d, const uint8_t e, const uint8_t f)
noexcept
: m_mac( : m_mac(
(((uint64_t)a) << 40U) | (((uint64_t)b) << 32U) | (((uint64_t)c) << 24U) | (((uint64_t)d) << 16U) (((uint64_t)a) << 40U) | (((uint64_t)b) << 32U) | (((uint64_t)c) << 24U) | (((uint64_t)d) << 16U)
| (((uint64_t)e) << 8U) | ((uint64_t)f)) | (((uint64_t)e) << 8U) | ((uint64_t)f))

5
core/Poly1305.cpp
View file

@ -6,13 +6,10 @@ Public domain.
// Small modifications have been made for ZeroTier, but this code remains in the public domain. // Small modifications have been made for ZeroTier, but this code remains in the public domain.
#include "Poly1305.hpp"
#include "Constants.hpp" #include "Constants.hpp"
#include "Poly1305.hpp"
#include "Utils.hpp" #include "Utils.hpp"
#include <cstring>
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#pragma warning(disable : 4146) #pragma warning(disable : 4146)
#endif #endif

2
core/Poly1305.hpp
View file

@ -14,6 +14,8 @@
#ifndef ZT_POLY1305_HPP #ifndef ZT_POLY1305_HPP
#define ZT_POLY1305_HPP #define ZT_POLY1305_HPP
#include "Constants.hpp"
namespace ZeroTier { namespace ZeroTier {
#define ZT_POLY1305_KEY_SIZE 32 #define ZT_POLY1305_KEY_SIZE 32

8
core/version.h.in
View file

@ -17,17 +17,17 @@
/** /**
* Major version * Major version
*/ */
#define ZEROTIER_VERSION_MAJOR @ZEROTIER_VERSION_MAJOR @ #define ZEROTIER_VERSION_MAJOR @ZEROTIER_VERSION_MAJOR@
/** /**
* Minor version * Minor version
*/ */
#define ZEROTIER_VERSION_MINOR @ZEROTIER_VERSION_MINOR @ #define ZEROTIER_VERSION_MINOR @ZEROTIER_VERSION_MINOR@
/** /**
* Revision * Revision
*/ */
#define ZEROTIER_VERSION_REVISION @ZEROTIER_VERSION_REVISION @ #define ZEROTIER_VERSION_REVISION @ZEROTIER_VERSION_REVISION@
/** /**
* Build version * Build version
@ -36,6 +36,6 @@
* to force a minor update without an actual version number change. It's * to force a minor update without an actual version number change. It's
* not part of the actual release version number. * not part of the actual release version number.
*/ */
#define ZEROTIER_VERSION_BUILD @ZEROTIER_VERSION_BUILD @ #define ZEROTIER_VERSION_BUILD @ZEROTIER_VERSION_BUILD@
#endif #endif