ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-29 15:43:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for new identity generation bug.

Browse Source
This commit is contained in:
Adam Ierymenko 2017-07-13 16:31:16 -07:00
parent ba6fd16823
commit c692f2e740
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
node/C25519.cpp
View File

@ -286,24 +286,10 @@ static inline int crypto_scalarmult(unsigned char *q,const unsigned char *n,cons
return 0;
}
//static const unsigned char base[32] = {9};
static const unsigned char base[32] = {9};
static inline int crypto_scalarmult_base(unsigned char *q,const unsigned char *n)
{
//return crypto_scalarmult(q,n,base);
unsigned int work[96];
unsigned char e[32];
unsigned int i;
for (i = 0;i < 32;++i) e[i] = n[i];
e[0] &= 248;
e[31] &= 127;
e[31] |= 64;
for (i = 0;i < 32;++i) work[i] = 9;
mainloop(work,e);
recip(work + 32,work + 32);
mult(work + 64,work,work + 32);
freeze(work + 64);
for (i = 0;i < 32;++i) q[i] = work[64 + i];
return 0;
return crypto_scalarmult(q,n,base);
}
//////////////////////////////////////////////////////////////////////////////

1
node/Node.cpp
View File

@ -117,6 +117,7 @@ Node::Node(void *uptr,void *tptr,const struct ZT_Node_Callbacks *callbacks,uint6
delete RR->topology;
delete RR->mc;
delete RR->sw;
delete RR->t;
throw;
}

2
node/Utils.hpp
View File

@ -148,7 +148,7 @@ public:
static inline char *hex(const void *d,unsigned int l,char *s)
{
char *save = s;
char *const save = s;
for(unsigned int i=0;i<l;++i) {
const unsigned int b = reinterpret_cast<const uint8_t *>(d)[i];
*(s++) = HEXCHARS[b >> 4];