ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-06 11:10:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Speed tweaks for signatures, etc.

Browse Source
This commit is contained in:
Adam Ierymenko 2018-03-12 16:16:20 -07:00
parent b4e2547052
commit 610e594a50
3 changed files with 1287 additions and 1260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1731
node/C25519.cpp
View File

File diff suppressed because it is too large Load Diff

499
node/SHA512.cpp
View File

@ -14,6 +14,22 @@ Public domain.
#include "SHA512.hpp" #include "SHA512.hpp"
#include "Utils.hpp" #include "Utils.hpp"
#ifdef __APPLE__
#include <CommonCrypto/CommonDigest.h>
#define ZT_HAVE_NATIVE_SHA512
namespace ZeroTier {
void SHA512::hash(void *digest,const void *data,unsigned int len)
{
CC_SHA512_CTX ctx;
CC_SHA512_Init(&ctx);
CC_SHA512_Update(&ctx,data,len);
CC_SHA512_Final(reinterpret_cast<unsigned char *>(digest),&ctx);
}
}
#endif
#ifndef ZT_HAVE_NATIVE_SHA512
namespace ZeroTier { namespace ZeroTier {
#define uint64 uint64_t #define uint64 uint64_t
@ -22,28 +38,28 @@ namespace ZeroTier {
static uint64 load_bigendian(const unsigned char *x) static uint64 load_bigendian(const unsigned char *x)
{ {
return return
(uint64) (x[7]) \ (uint64) (x[7]) \
| (((uint64) (x[6])) << 8) \ | (((uint64) (x[6])) << 8) \
| (((uint64) (x[5])) << 16) \ | (((uint64) (x[5])) << 16) \
| (((uint64) (x[4])) << 24) \ | (((uint64) (x[4])) << 24) \
| (((uint64) (x[3])) << 32) \ | (((uint64) (x[3])) << 32) \
| (((uint64) (x[2])) << 40) \ | (((uint64) (x[2])) << 40) \
| (((uint64) (x[1])) << 48) \ | (((uint64) (x[1])) << 48) \
| (((uint64) (x[0])) << 56) | (((uint64) (x[0])) << 56)
; ;
} }
static void store_bigendian(unsigned char *x,uint64 u) static void store_bigendian(unsigned char *x,uint64 u)
{ {
x[7] = u; u >>= 8; x[7] = u; u >>= 8;
x[6] = u; u >>= 8; x[6] = u; u >>= 8;
x[5] = u; u >>= 8; x[5] = u; u >>= 8;
x[4] = u; u >>= 8; x[4] = u; u >>= 8;
x[3] = u; u >>= 8; x[3] = u; u >>= 8;
x[2] = u; u >>= 8; x[2] = u; u >>= 8;
x[1] = u; u >>= 8; x[1] = u; u >>= 8;
x[0] = u; x[0] = u;
} }
#else // !ZT_NO_TYPE_PUNNING #else // !ZT_NO_TYPE_PUNNING
@ -66,266 +82,265 @@ static void store_bigendian(unsigned char *x,uint64 u)
#define M(w0,w14,w9,w1) w0 = sigma1(w14) + w9 + sigma0(w1) + w0; #define M(w0,w14,w9,w1) w0 = sigma1(w14) + w9 + sigma0(w1) + w0;
#define EXPAND \ #define EXPAND \
M(w0 ,w14,w9 ,w1 ) \ M(w0 ,w14,w9 ,w1 ) \
M(w1 ,w15,w10,w2 ) \ M(w1 ,w15,w10,w2 ) \
M(w2 ,w0 ,w11,w3 ) \ M(w2 ,w0 ,w11,w3 ) \
M(w3 ,w1 ,w12,w4 ) \ M(w3 ,w1 ,w12,w4 ) \
M(w4 ,w2 ,w13,w5 ) \ M(w4 ,w2 ,w13,w5 ) \
M(w5 ,w3 ,w14,w6 ) \ M(w5 ,w3 ,w14,w6 ) \
M(w6 ,w4 ,w15,w7 ) \ M(w6 ,w4 ,w15,w7 ) \
M(w7 ,w5 ,w0 ,w8 ) \ M(w7 ,w5 ,w0 ,w8 ) \
M(w8 ,w6 ,w1 ,w9 ) \ M(w8 ,w6 ,w1 ,w9 ) \
M(w9 ,w7 ,w2 ,w10) \ M(w9 ,w7 ,w2 ,w10) \
M(w10,w8 ,w3 ,w11) \ M(w10,w8 ,w3 ,w11) \
M(w11,w9 ,w4 ,w12) \ M(w11,w9 ,w4 ,w12) \
M(w12,w10,w5 ,w13) \ M(w12,w10,w5 ,w13) \
M(w13,w11,w6 ,w14) \ M(w13,w11,w6 ,w14) \
M(w14,w12,w7 ,w15) \ M(w14,w12,w7 ,w15) \
M(w15,w13,w8 ,w0 ) M(w15,w13,w8 ,w0 )
#define F(w,k) \ #define F(w,k) \
T1 = h + Sigma1(e) + Ch(e,f,g) + k + w; \ T1 = h + Sigma1(e) + Ch(e,f,g) + k + w; \
T2 = Sigma0(a) + Maj(a,b,c); \ T2 = Sigma0(a) + Maj(a,b,c); \
h = g; \ h = g; \
g = f; \ g = f; \
f = e; \ f = e; \
e = d + T1; \ e = d + T1; \
d = c; \ d = c; \
c = b; \ c = b; \
b = a; \ b = a; \
a = T1 + T2; a = T1 + T2;
static inline int crypto_hashblocks(unsigned char *statebytes,const unsigned char *in,unsigned long long inlen) static inline int crypto_hashblocks(unsigned char *statebytes,const unsigned char *in,unsigned long long inlen)
{ {
uint64 state[8]; uint64 state[8];
uint64 a; uint64 a;
uint64 b; uint64 b;
uint64 c; uint64 c;
uint64 d; uint64 d;
uint64 e; uint64 e;
uint64 f; uint64 f;
uint64 g; uint64 g;
uint64 h; uint64 h;
uint64 T1; uint64 T1;
uint64 T2; uint64 T2;
a = load_bigendian(statebytes + 0); state[0] = a; a = load_bigendian(statebytes + 0); state[0] = a;
b = load_bigendian(statebytes + 8); state[1] = b; b = load_bigendian(statebytes + 8); state[1] = b;
c = load_bigendian(statebytes + 16); state[2] = c; c = load_bigendian(statebytes + 16); state[2] = c;
d = load_bigendian(statebytes + 24); state[3] = d; d = load_bigendian(statebytes + 24); state[3] = d;
e = load_bigendian(statebytes + 32); state[4] = e; e = load_bigendian(statebytes + 32); state[4] = e;
f = load_bigendian(statebytes + 40); state[5] = f; f = load_bigendian(statebytes + 40); state[5] = f;
g = load_bigendian(statebytes + 48); state[6] = g; g = load_bigendian(statebytes + 48); state[6] = g;
h = load_bigendian(statebytes + 56); state[7] = h; h = load_bigendian(statebytes + 56); state[7] = h;
while (inlen >= 128) { while (inlen >= 128) {
uint64 w0 = load_bigendian(in + 0); uint64 w0 = load_bigendian(in + 0);
uint64 w1 = load_bigendian(in + 8); uint64 w1 = load_bigendian(in + 8);
uint64 w2 = load_bigendian(in + 16); uint64 w2 = load_bigendian(in + 16);
uint64 w3 = load_bigendian(in + 24); uint64 w3 = load_bigendian(in + 24);
uint64 w4 = load_bigendian(in + 32); uint64 w4 = load_bigendian(in + 32);
uint64 w5 = load_bigendian(in + 40); uint64 w5 = load_bigendian(in + 40);
uint64 w6 = load_bigendian(in + 48); uint64 w6 = load_bigendian(in + 48);
uint64 w7 = load_bigendian(in + 56); uint64 w7 = load_bigendian(in + 56);
uint64 w8 = load_bigendian(in + 64); uint64 w8 = load_bigendian(in + 64);
uint64 w9 = load_bigendian(in + 72); uint64 w9 = load_bigendian(in + 72);
uint64 w10 = load_bigendian(in + 80); uint64 w10 = load_bigendian(in + 80);
uint64 w11 = load_bigendian(in + 88); uint64 w11 = load_bigendian(in + 88);
uint64 w12 = load_bigendian(in + 96); uint64 w12 = load_bigendian(in + 96);
uint64 w13 = load_bigendian(in + 104); uint64 w13 = load_bigendian(in + 104);
uint64 w14 = load_bigendian(in + 112); uint64 w14 = load_bigendian(in + 112);
uint64 w15 = load_bigendian(in + 120); uint64 w15 = load_bigendian(in + 120);
F(w0 ,0x428a2f98d728ae22ULL) F(w0 ,0x428a2f98d728ae22ULL)
F(w1 ,0x7137449123ef65cdULL) F(w1 ,0x7137449123ef65cdULL)
F(w2 ,0xb5c0fbcfec4d3b2fULL) F(w2 ,0xb5c0fbcfec4d3b2fULL)
F(w3 ,0xe9b5dba58189dbbcULL) F(w3 ,0xe9b5dba58189dbbcULL)
F(w4 ,0x3956c25bf348b538ULL) F(w4 ,0x3956c25bf348b538ULL)
F(w5 ,0x59f111f1b605d019ULL) F(w5 ,0x59f111f1b605d019ULL)
F(w6 ,0x923f82a4af194f9bULL) F(w6 ,0x923f82a4af194f9bULL)
F(w7 ,0xab1c5ed5da6d8118ULL) F(w7 ,0xab1c5ed5da6d8118ULL)
F(w8 ,0xd807aa98a3030242ULL) F(w8 ,0xd807aa98a3030242ULL)
F(w9 ,0x12835b0145706fbeULL) F(w9 ,0x12835b0145706fbeULL)
F(w10,0x243185be4ee4b28cULL) F(w10,0x243185be4ee4b28cULL)
F(w11,0x550c7dc3d5ffb4e2ULL) F(w11,0x550c7dc3d5ffb4e2ULL)
F(w12,0x72be5d74f27b896fULL) F(w12,0x72be5d74f27b896fULL)
F(w13,0x80deb1fe3b1696b1ULL) F(w13,0x80deb1fe3b1696b1ULL)
F(w14,0x9bdc06a725c71235ULL) F(w14,0x9bdc06a725c71235ULL)
F(w15,0xc19bf174cf692694ULL) F(w15,0xc19bf174cf692694ULL)
EXPAND EXPAND
F(w0 ,0xe49b69c19ef14ad2ULL) F(w0 ,0xe49b69c19ef14ad2ULL)
F(w1 ,0xefbe4786384f25e3ULL) F(w1 ,0xefbe4786384f25e3ULL)
F(w2 ,0x0fc19dc68b8cd5b5ULL) F(w2 ,0x0fc19dc68b8cd5b5ULL)
F(w3 ,0x240ca1cc77ac9c65ULL) F(w3 ,0x240ca1cc77ac9c65ULL)
F(w4 ,0x2de92c6f592b0275ULL) F(w4 ,0x2de92c6f592b0275ULL)
F(w5 ,0x4a7484aa6ea6e483ULL) F(w5 ,0x4a7484aa6ea6e483ULL)
F(w6 ,0x5cb0a9dcbd41fbd4ULL) F(w6 ,0x5cb0a9dcbd41fbd4ULL)
F(w7 ,0x76f988da831153b5ULL) F(w7 ,0x76f988da831153b5ULL)
F(w8 ,0x983e5152ee66dfabULL) F(w8 ,0x983e5152ee66dfabULL)
F(w9 ,0xa831c66d2db43210ULL) F(w9 ,0xa831c66d2db43210ULL)
F(w10,0xb00327c898fb213fULL) F(w10,0xb00327c898fb213fULL)
F(w11,0xbf597fc7beef0ee4ULL) F(w11,0xbf597fc7beef0ee4ULL)
F(w12,0xc6e00bf33da88fc2ULL) F(w12,0xc6e00bf33da88fc2ULL)
F(w13,0xd5a79147930aa725ULL) F(w13,0xd5a79147930aa725ULL)
F(w14,0x06ca6351e003826fULL) F(w14,0x06ca6351e003826fULL)
F(w15,0x142929670a0e6e70ULL) F(w15,0x142929670a0e6e70ULL)
EXPAND EXPAND
F(w0 ,0x27b70a8546d22ffcULL) F(w0 ,0x27b70a8546d22ffcULL)
F(w1 ,0x2e1b21385c26c926ULL) F(w1 ,0x2e1b21385c26c926ULL)
F(w2 ,0x4d2c6dfc5ac42aedULL) F(w2 ,0x4d2c6dfc5ac42aedULL)
F(w3 ,0x53380d139d95b3dfULL) F(w3 ,0x53380d139d95b3dfULL)
F(w4 ,0x650a73548baf63deULL) F(w4 ,0x650a73548baf63deULL)
F(w5 ,0x766a0abb3c77b2a8ULL) F(w5 ,0x766a0abb3c77b2a8ULL)
F(w6 ,0x81c2c92e47edaee6ULL) F(w6 ,0x81c2c92e47edaee6ULL)
F(w7 ,0x92722c851482353bULL) F(w7 ,0x92722c851482353bULL)
F(w8 ,0xa2bfe8a14cf10364ULL) F(w8 ,0xa2bfe8a14cf10364ULL)
F(w9 ,0xa81a664bbc423001ULL) F(w9 ,0xa81a664bbc423001ULL)
F(w10,0xc24b8b70d0f89791ULL) F(w10,0xc24b8b70d0f89791ULL)
F(w11,0xc76c51a30654be30ULL) F(w11,0xc76c51a30654be30ULL)
F(w12,0xd192e819d6ef5218ULL) F(w12,0xd192e819d6ef5218ULL)
F(w13,0xd69906245565a910ULL) F(w13,0xd69906245565a910ULL)
F(w14,0xf40e35855771202aULL) F(w14,0xf40e35855771202aULL)
F(w15,0x106aa07032bbd1b8ULL) F(w15,0x106aa07032bbd1b8ULL)
EXPAND EXPAND
F(w0 ,0x19a4c116b8d2d0c8ULL) F(w0 ,0x19a4c116b8d2d0c8ULL)
F(w1 ,0x1e376c085141ab53ULL) F(w1 ,0x1e376c085141ab53ULL)
F(w2 ,0x2748774cdf8eeb99ULL) F(w2 ,0x2748774cdf8eeb99ULL)
F(w3 ,0x34b0bcb5e19b48a8ULL) F(w3 ,0x34b0bcb5e19b48a8ULL)
F(w4 ,0x391c0cb3c5c95a63ULL) F(w4 ,0x391c0cb3c5c95a63ULL)
F(w5 ,0x4ed8aa4ae3418acbULL) F(w5 ,0x4ed8aa4ae3418acbULL)
F(w6 ,0x5b9cca4f7763e373ULL) F(w6 ,0x5b9cca4f7763e373ULL)
F(w7 ,0x682e6ff3d6b2b8a3ULL) F(w7 ,0x682e6ff3d6b2b8a3ULL)
F(w8 ,0x748f82ee5defb2fcULL) F(w8 ,0x748f82ee5defb2fcULL)
F(w9 ,0x78a5636f43172f60ULL) F(w9 ,0x78a5636f43172f60ULL)
F(w10,0x84c87814a1f0ab72ULL) F(w10,0x84c87814a1f0ab72ULL)
F(w11,0x8cc702081a6439ecULL) F(w11,0x8cc702081a6439ecULL)
F(w12,0x90befffa23631e28ULL) F(w12,0x90befffa23631e28ULL)
F(w13,0xa4506cebde82bde9ULL) F(w13,0xa4506cebde82bde9ULL)
F(w14,0xbef9a3f7b2c67915ULL) F(w14,0xbef9a3f7b2c67915ULL)
F(w15,0xc67178f2e372532bULL) F(w15,0xc67178f2e372532bULL)
EXPAND EXPAND
F(w0 ,0xca273eceea26619cULL) F(w0 ,0xca273eceea26619cULL)
F(w1 ,0xd186b8c721c0c207ULL) F(w1 ,0xd186b8c721c0c207ULL)
F(w2 ,0xeada7dd6cde0eb1eULL) F(w2 ,0xeada7dd6cde0eb1eULL)
F(w3 ,0xf57d4f7fee6ed178ULL) F(w3 ,0xf57d4f7fee6ed178ULL)
F(w4 ,0x06f067aa72176fbaULL) F(w4 ,0x06f067aa72176fbaULL)
F(w5 ,0x0a637dc5a2c898a6ULL) F(w5 ,0x0a637dc5a2c898a6ULL)
F(w6 ,0x113f9804bef90daeULL) F(w6 ,0x113f9804bef90daeULL)
F(w7 ,0x1b710b35131c471bULL) F(w7 ,0x1b710b35131c471bULL)
F(w8 ,0x28db77f523047d84ULL) F(w8 ,0x28db77f523047d84ULL)
F(w9 ,0x32caab7b40c72493ULL) F(w9 ,0x32caab7b40c72493ULL)
F(w10,0x3c9ebe0a15c9bebcULL) F(w10,0x3c9ebe0a15c9bebcULL)
F(w11,0x431d67c49c100d4cULL) F(w11,0x431d67c49c100d4cULL)
F(w12,0x4cc5d4becb3e42b6ULL) F(w12,0x4cc5d4becb3e42b6ULL)
F(w13,0x597f299cfc657e2aULL) F(w13,0x597f299cfc657e2aULL)
F(w14,0x5fcb6fab3ad6faecULL) F(w14,0x5fcb6fab3ad6faecULL)
F(w15,0x6c44198c4a475817ULL) F(w15,0x6c44198c4a475817ULL)
a += state[0]; a += state[0];
b += state[1]; b += state[1];
c += state[2]; c += state[2];
d += state[3]; d += state[3];
e += state[4]; e += state[4];
f += state[5]; f += state[5];
g += state[6]; g += state[6];
h += state[7]; h += state[7];
state[0] = a; state[0] = a;
state[1] = b; state[1] = b;
state[2] = c; state[2] = c;
state[3] = d; state[3] = d;
state[4] = e; state[4] = e;
state[5] = f; state[5] = f;
state[6] = g; state[6] = g;
state[7] = h; state[7] = h;
in += 128; in += 128;
inlen -= 128; inlen -= 128;
} }
store_bigendian(statebytes + 0,state[0]); store_bigendian(statebytes + 0,state[0]);
store_bigendian(statebytes + 8,state[1]); store_bigendian(statebytes + 8,state[1]);
store_bigendian(statebytes + 16,state[2]); store_bigendian(statebytes + 16,state[2]);
store_bigendian(statebytes + 24,state[3]); store_bigendian(statebytes + 24,state[3]);
store_bigendian(statebytes + 32,state[4]); store_bigendian(statebytes + 32,state[4]);
store_bigendian(statebytes + 40,state[5]); store_bigendian(statebytes + 40,state[5]);
store_bigendian(statebytes + 48,state[6]); store_bigendian(statebytes + 48,state[6]);
store_bigendian(statebytes + 56,state[7]); store_bigendian(statebytes + 56,state[7]);
return 0; return 0;
} }
#define blocks crypto_hashblocks #define blocks crypto_hashblocks
static const unsigned char iv[64] = { static const unsigned char iv[64] = {
0x6a,0x09,0xe6,0x67,0xf3,0xbc,0xc9,0x08, 0x6a,0x09,0xe6,0x67,0xf3,0xbc,0xc9,0x08,
0xbb,0x67,0xae,0x85,0x84,0xca,0xa7,0x3b, 0xbb,0x67,0xae,0x85,0x84,0xca,0xa7,0x3b,
0x3c,0x6e,0xf3,0x72,0xfe,0x94,0xf8,0x2b, 0x3c,0x6e,0xf3,0x72,0xfe,0x94,0xf8,0x2b,
0xa5,0x4f,0xf5,0x3a,0x5f,0x1d,0x36,0xf1, 0xa5,0x4f,0xf5,0x3a,0x5f,0x1d,0x36,0xf1,
0x51,0x0e,0x52,0x7f,0xad,0xe6,0x82,0xd1, 0x51,0x0e,0x52,0x7f,0xad,0xe6,0x82,0xd1,
0x9b,0x05,0x68,0x8c,0x2b,0x3e,0x6c,0x1f, 0x9b,0x05,0x68,0x8c,0x2b,0x3e,0x6c,0x1f,
0x1f,0x83,0xd9,0xab,0xfb,0x41,0xbd,0x6b, 0x1f,0x83,0xd9,0xab,0xfb,0x41,0xbd,0x6b,
0x5b,0xe0,0xcd,0x19,0x13,0x7e,0x21,0x79 0x5b,0xe0,0xcd,0x19,0x13,0x7e,0x21,0x79
}; };
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
void SHA512::hash(void *digest,const void *data,unsigned int len) void SHA512::hash(void *digest,const void *data,unsigned int len)
{ {
unsigned char h[64]; unsigned char h[64];
unsigned char padded[256]; unsigned char padded[256];
int i; int i;
uint64_t bytes = len; uint64_t bytes = len;
const unsigned char *in = (const unsigned char *)data; const unsigned char *in = (const unsigned char *)data;
unsigned int inlen = len; unsigned int inlen = len;
for (i = 0;i < 64;++i) h[i] = iv[i]; for (i = 0;i < 64;++i) h[i] = iv[i];
blocks(h,in,inlen); blocks(h,in,inlen);
in += inlen; in += inlen;
inlen &= 127; inlen &= 127;
in -= inlen; in -= inlen;
for (i = 0;i < (int)inlen;++i) padded[i] = in[i]; for (i = 0;i < (int)inlen;++i) padded[i] = in[i];
padded[inlen] = 0x80; padded[inlen] = 0x80;
if (inlen < 112) { if (inlen < 112) {
for (i = inlen + 1;i < 119;++i) padded[i] = 0; for (i = inlen + 1;i < 119;++i) padded[i] = 0;
padded[119] = (unsigned char)((bytes >> 61) & 0xff); padded[119] = (unsigned char)((bytes >> 61) & 0xff);
padded[120] = (unsigned char)((bytes >> 53) & 0xff); padded[120] = (unsigned char)((bytes >> 53) & 0xff);
padded[121] = (unsigned char)((bytes >> 45) & 0xff); padded[121] = (unsigned char)((bytes >> 45) & 0xff);
padded[122] = (unsigned char)((bytes >> 37) & 0xff); padded[122] = (unsigned char)((bytes >> 37) & 0xff);
padded[123] = (unsigned char)((bytes >> 29) & 0xff); padded[123] = (unsigned char)((bytes >> 29) & 0xff);
padded[124] = (unsigned char)((bytes >> 21) & 0xff); padded[124] = (unsigned char)((bytes >> 21) & 0xff);
padded[125] = (unsigned char)((bytes >> 13) & 0xff); padded[125] = (unsigned char)((bytes >> 13) & 0xff);
padded[126] = (unsigned char)((bytes >> 5) & 0xff); padded[126] = (unsigned char)((bytes >> 5) & 0xff);
padded[127] = (unsigned char)((bytes << 3) & 0xff); padded[127] = (unsigned char)((bytes << 3) & 0xff);
blocks(h,padded,128); blocks(h,padded,128);
} else { } else {
for (i = inlen + 1;i < 247;++i) padded[i] = 0; for (i = inlen + 1;i < 247;++i) padded[i] = 0;
padded[247] = (unsigned char)((bytes >> 61) & 0xff); padded[247] = (unsigned char)((bytes >> 61) & 0xff);
padded[248] = (unsigned char)((bytes >> 53) & 0xff); padded[248] = (unsigned char)((bytes >> 53) & 0xff);
padded[249] = (unsigned char)((bytes >> 45) & 0xff); padded[249] = (unsigned char)((bytes >> 45) & 0xff);
padded[250] = (unsigned char)((bytes >> 37) & 0xff); padded[250] = (unsigned char)((bytes >> 37) & 0xff);
padded[251] = (unsigned char)((bytes >> 29) & 0xff); padded[251] = (unsigned char)((bytes >> 29) & 0xff);
padded[252] = (unsigned char)((bytes >> 21) & 0xff); padded[252] = (unsigned char)((bytes >> 21) & 0xff);
padded[253] = (unsigned char)((bytes >> 13) & 0xff); padded[253] = (unsigned char)((bytes >> 13) & 0xff);
padded[254] = (unsigned char)((bytes >> 5) & 0xff); padded[254] = (unsigned char)((bytes >> 5) & 0xff);
padded[255] = (unsigned char)((bytes << 3) & 0xff); padded[255] = (unsigned char)((bytes << 3) & 0xff);
blocks(h,padded,256); blocks(h,padded,256);
} }
for (i = 0;i < 64;++i) ((unsigned char *)digest)[i] = h[i]; for (i = 0;i < 64;++i) ((unsigned char *)digest)[i] = h[i];
} }
} // namespace ZeroTier } // namespace ZeroTier
#endif

13
selftest.cpp
View File

@ -376,11 +376,11 @@ static int testCrypto()
C25519::Pair bp[8]; C25519::Pair bp[8];
for(int k=0;k<8;++k) for(int k=0;k<8;++k)
bp[k] = C25519::generate(); bp[k] = C25519::generate();
const uint64_t st = OSUtils::now(); uint64_t st = OSUtils::now();
for(unsigned int k=0;k<50;++k) { for(unsigned int k=0;k<50;++k) {
C25519::agree(bp[~k & 7],bp[k & 7].pub,buf1,64); C25519::agree(bp[~k & 7],bp[k & 7].pub,buf1,64);
} }
const uint64_t et = OSUtils::now(); uint64_t et = OSUtils::now();
std::cout << ((double)(et - st) / 50.0) << "ms per agreement." << std::endl; std::cout << ((double)(et - st) / 50.0) << "ms per agreement." << std::endl;
std::cout << "[crypto] Testing Ed25519 ECC signatures... "; std::cout.flush(); std::cout << "[crypto] Testing Ed25519 ECC signatures... "; std::cout.flush();
@ -419,6 +419,15 @@ static int testCrypto()
} }
std::cout << "PASS" << std::endl; std::cout << "PASS" << std::endl;
std::cout << "[crypto] Benchmarking Ed25519 ECC signatures... "; std::cout.flush();
st = OSUtils::now();
for(int k=0;k<1000;++k) {
C25519::Signature sig;
C25519::sign(didntSign.priv,didntSign.pub,buf1,sizeof(buf1),sig.data);
}
et = OSUtils::now();
std::cout << ((double)(et - st) / 50.0) << "ms per signature." << std::endl;
return 0; return 0;
} }