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

Moar refactoring

Browse source
This commit is contained in:
Adam Ierymenko 2019-12-11 13:46:44 -08:00
parent 72361fb1c8
commit 23d6a3aacd
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
3 changed files with 294 additions and 310 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
node/Str.hpp
View file

@ -22,7 +22,7 @@
#include <string>
#define ZT_STR_CAPACITY 254
#define ZT_STR_CAPACITY 1021
namespace ZeroTier {
@ -197,25 +197,8 @@ public:
return h;
}
template<unsigned int C>
inline void serialize(Buffer<C> &b,const bool forSign = false) const
{
b.append(_l);
b.append(_s,(unsigned int)_l);
}
template<unsigned int C>
inline unsigned int deserialize(const Buffer<C> &b,unsigned int startAt = 0)
{
unsigned int p = startAt;
_l = (uint8_t)b[p++];
memcpy(_s,b.field(p,(unsigned int)_l),(unsigned long)_l);
p += (unsigned int)_l;
return (p - startAt);
}
private:
uint8_t _l;
uint16_t _l;
char _s[ZT_STR_CAPACITY+1];
};

32
node/Utils.cpp
View file

@ -40,8 +40,6 @@
#include "AES.hpp"
#include "SHA512.hpp"
namespace ZeroTier {
#if (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__) || defined(_M_X64))
#include <immintrin.h>
static bool _zt_rdrand_supported()
@ -63,7 +61,11 @@ static bool _zt_rdrand_supported()
static const bool _rdrandSupported = _zt_rdrand_supported();
#endif
const char Utils::HEXCHARS[16] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' };
namespace ZeroTier {
namespace Utils {
const char HEXCHARS[16] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' };
// Crazy hack to force memory to be securely zeroed in spite of the best efforts of optimizing compilers.
static void _Utils_doBurn(volatile uint8_t *ptr,unsigned int len)
@ -72,7 +74,7 @@ static void _Utils_doBurn(volatile uint8_t *ptr,unsigned int len)
while (ptr != end) *(ptr++) = (uint8_t)0;
}
static void (*volatile _Utils_doBurn_ptr)(volatile uint8_t *,unsigned int) = _Utils_doBurn;
void Utils::burn(void *ptr,unsigned int len) { (_Utils_doBurn_ptr)((volatile uint8_t *)ptr,len); }
void burn(void *ptr,unsigned int len) { (_Utils_doBurn_ptr)((volatile uint8_t *)ptr,len); }
static unsigned long _Utils_itoa(unsigned long n,char *s)
{
@ -84,7 +86,7 @@ static unsigned long _Utils_itoa(unsigned long n,char *s)
s[pos] = '0' + (char)(n % 10);
return pos + 1;
}
char *Utils::decimal(unsigned long n,char s[24])
char *decimal(unsigned long n,char s[24])
{
if (n == 0) {
s[0] = '0';
@ -95,7 +97,7 @@ char *Utils::decimal(unsigned long n,char s[24])
return s;
}
unsigned short Utils::crc16(const void *buf,unsigned int len)
unsigned short crc16(const void *buf,unsigned int len)
{
static const uint16_t crc16tab[256]= {
0x0000,0x1021,0x2042,0x3063,0x4084,0x50a5,0x60c6,0x70e7,
@ -138,7 +140,7 @@ unsigned short Utils::crc16(const void *buf,unsigned int len)
return crc;
}
unsigned int Utils::unhex(const char *h,void *buf,unsigned int buflen)
unsigned int unhex(const char *h,void *buf,unsigned int buflen)
{
unsigned int l = 0;
while (l < buflen) {
@ -169,7 +171,7 @@ unsigned int Utils::unhex(const char *h,void *buf,unsigned int buflen)
return l;
}
unsigned int Utils::unhex(const char *h,unsigned int hlen,void *buf,unsigned int buflen)
unsigned int unhex(const char *h,unsigned int hlen,void *buf,unsigned int buflen)
{
unsigned int l = 0;
const char *hend = h + hlen;
@ -203,7 +205,7 @@ unsigned int Utils::unhex(const char *h,unsigned int hlen,void *buf,unsigned int
return l;
}
void Utils::getSecureRandom(void *buf,unsigned int bytes)
void getSecureRandom(void *buf,unsigned int bytes)
{
static Mutex globalLock;
static bool initialized = false;
@ -281,7 +283,7 @@ void Utils::getSecureRandom(void *buf,unsigned int bytes)
}
}
int Utils::b32e(const uint8_t *data,int length,char *result,int bufSize)
int b32e(const uint8_t *data,int length,char *result,int bufSize)
{
if (length < 0 || length > (1 << 28)) {
result[0] = (char)0;
@ -317,7 +319,7 @@ int Utils::b32e(const uint8_t *data,int length,char *result,int bufSize)
return -1;
}
int Utils::b32d(const char *encoded,uint8_t *result,int bufSize)
int b32d(const char *encoded,uint8_t *result,int bufSize)
{
int buffer = 0;
int bitsLeft = 0;
@ -357,7 +359,7 @@ int Utils::b32d(const char *encoded,uint8_t *result,int bufSize)
return count;
}
unsigned int Utils::b64e(const uint8_t *in,unsigned int inlen,char *out,unsigned int outlen)
unsigned int b64e(const uint8_t *in,unsigned int inlen,char *out,unsigned int outlen)
{
static const char base64en[64] = { 'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','0','1','2','3','4','5','6','7','8','9','+','/' };
unsigned int i = 0,j = 0;
@ -404,7 +406,7 @@ unsigned int Utils::b64e(const uint8_t *in,unsigned int inlen,char *out,unsigned
return j;
}
unsigned int Utils::b64d(const char *in,unsigned char *out,unsigned int outlen)
unsigned int b64d(const char *in,unsigned char *out,unsigned int outlen)
{
static const uint8_t base64de[256] = { 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,62,255,255,255,63,52,53,54,55,56,57,58,59,60,61,255,255,255,255,255,255,255,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,255,255,255,255,255,255,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,255,255,255,255,255 };
unsigned int i = 0;
@ -437,7 +439,7 @@ unsigned int Utils::b64d(const char *in,unsigned char *out,unsigned int outlen)
}
#define ROL64(x,k) (((x) << (k)) | ((x) >> (64 - (k))))
uint64_t Utils::random()
uint64_t random()
{
// https://en.wikipedia.org/wiki/Xorshift#xoshiro256**
static Mutex l;
@ -460,4 +462,6 @@ uint64_t Utils::random()
return result;
}
} // namespace Utils
} // namespace ZeroTier

37
node/Utils.hpp
View file

@ -29,16 +29,12 @@
namespace ZeroTier {
/**
* Miscellaneous utility functions and global constants
*/
class Utils
{
public:
namespace Utils {
/**
* Hexadecimal characters 0-f
*/
static const char HEXCHARS[16];
const char HEXCHARS[16];
/**
* Perform a time-invariant binary comparison
@ -48,7 +44,7 @@ public:
* @param len Length of strings
* @return True if strings are equal
*/
static ZT_ALWAYS_INLINE bool secureEq(const void *a,const void *b,unsigned int len)
ZT_ALWAYS_INLINE bool secureEq(const void *a,const void *b,unsigned int len)
{
uint8_t diff = 0;
for(unsigned int i=0;i<len;++i)
@ -59,19 +55,19 @@ public:
/**
* Zero memory, ensuring to avoid any compiler optimizations or other things that may stop this.
*/
static void burn(void *ptr,unsigned int len);
void burn(void *ptr,unsigned int len);
/**
* @param n Number to convert
* @param s Buffer, at least 24 bytes in size
* @return String containing 'n' in base 10 form
*/
static char *decimal(unsigned long n,char s[24]);
char *decimal(unsigned long n,char s[24]);
/**
* Compute CRC16-CCITT
*/
static uint16_t crc16(const void *buf,unsigned int len);
uint16_t crc16(const void *buf,unsigned int len);
/**
* Convert an unsigned integer into hex
@ -135,8 +131,8 @@ public:
return save;
}
static unsigned int unhex(const char *h,void *buf,unsigned int buflen);
static unsigned int unhex(const char *h,unsigned int hlen,void *buf,unsigned int buflen);
unsigned int unhex(const char *h,void *buf,unsigned int buflen);
unsigned int unhex(const char *h,unsigned int hlen,void *buf,unsigned int buflen);
/**
* Generate secure random bytes
@ -147,7 +143,7 @@ public:
* @param buf Buffer to fill
* @param bytes Number of random bytes to generate
*/
static void getSecureRandom(void *buf,unsigned int bytes);
void getSecureRandom(void *buf,unsigned int bytes);
/**
* Get a 64-bit unsigned secure random number
@ -159,17 +155,17 @@ public:
return x;
}
static int b32e(const uint8_t *data,int length,char *result,int bufSize);
static int b32d(const char *encoded, uint8_t *result, int bufSize);
int b32e(const uint8_t *data,int length,char *result,int bufSize);
int b32d(const char *encoded, uint8_t *result, int bufSize);
static ZT_ALWAYS_INLINE unsigned int b64MaxEncodedSize(const unsigned int s) { return ((((s + 2) / 3) * 4) + 1); }
static unsigned int b64e(const uint8_t *in,unsigned int inlen,char *out,unsigned int outlen);
static unsigned int b64d(const char *in,uint8_t *out,unsigned int outlen);
unsigned int b64e(const uint8_t *in,unsigned int inlen,char *out,unsigned int outlen);
unsigned int b64d(const char *in,uint8_t *out,unsigned int outlen);
/**
* Get a non-cryptographic random integer
*/
static uint64_t random();
uint64_t random();
static ZT_ALWAYS_INLINE float normalize(float value, int64_t bigMin, int64_t bigMax, int32_t targetMin, int32_t targetMax)
{
@ -377,7 +373,8 @@ public:
template<typename T>
static ZT_ALWAYS_INLINE T ntoh(T n) { return n; }
#endif
};
} // namespace Utils
} // namespace ZeroTier