From 307befa892970005b373ae7b8e5a20095d0e4320 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Sun, 15 Sep 2024 17:34:01 -0400 Subject: [PATCH] Rename C25519.* to ECC.* --- attic/world/mkworld.cpp | 8 +-- ext/ed25519-amd64-asm/sign.c | 2 +- node/Capability.hpp | 4 +- node/CertificateOfMembership.cpp | 2 +- node/CertificateOfMembership.hpp | 4 +- node/CertificateOfOwnership.hpp | 4 +- node/{C25519.cpp => ECC.cpp} | 12 ++-- node/{C25519.hpp => ECC.hpp} | 11 ++-- node/Identity.cpp | 14 ++--- node/Identity.hpp | 44 ++++++------- node/Network.cpp | 2 +- node/Node.cpp | 4 +- node/Revocation.hpp | 4 +- node/Tag.hpp | 4 +- node/World.hpp | 16 ++--- objects.mk | 2 +- one.cpp | 10 +-- selftest.cpp | 62 +++++++++---------- windows/ZeroTierOne/ZeroTierOne.vcxproj | 4 +- .../ZeroTierOne/ZeroTierOne.vcxproj.filters | 4 +- windows/ZeroTierOneSDK/ZeroTierOneSDK.vcxproj | 4 +- .../ZeroTierOneSDK.vcxproj.filters | 4 +- 22 files changed, 111 insertions(+), 114 deletions(-) rename node/{C25519.cpp => ECC.cpp} (99%) rename node/{C25519.hpp => ECC.hpp} (96%) diff --git a/attic/world/mkworld.cpp b/attic/world/mkworld.cpp index 6b9bbe8d0..ed2c499a0 100644 --- a/attic/world/mkworld.cpp +++ b/attic/world/mkworld.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include #include @@ -54,7 +54,7 @@ int main(int argc,char **argv) { std::string previous,current; if ((!OSUtils::readFile("previous.c25519",previous))||(!OSUtils::readFile("current.c25519",current))) { - C25519::Pair np(C25519::generate()); + ECC::Pair np(ECC::generate()); previous = std::string(); previous.append((const char *)np.pub.data,ZT_C25519_PUBLIC_KEY_LEN); previous.append((const char *)np.priv.data,ZT_C25519_PRIVATE_KEY_LEN); @@ -68,10 +68,10 @@ int main(int argc,char **argv) fprintf(stderr,"FATAL: previous.c25519 or current.c25519 empty or invalid" ZT_EOL_S); return 1; } - C25519::Pair previousKP; + ECC::Pair previousKP; memcpy(previousKP.pub.data,previous.data(),ZT_C25519_PUBLIC_KEY_LEN); memcpy(previousKP.priv.data,previous.data() + ZT_C25519_PUBLIC_KEY_LEN,ZT_C25519_PRIVATE_KEY_LEN); - C25519::Pair currentKP; + ECC::Pair currentKP; memcpy(currentKP.pub.data,current.data(),ZT_C25519_PUBLIC_KEY_LEN); memcpy(currentKP.priv.data,current.data() + ZT_C25519_PUBLIC_KEY_LEN,ZT_C25519_PRIVATE_KEY_LEN); diff --git a/ext/ed25519-amd64-asm/sign.c b/ext/ed25519-amd64-asm/sign.c index 882ae76f3..715feb5b7 100644 --- a/ext/ed25519-amd64-asm/sign.c +++ b/ext/ed25519-amd64-asm/sign.c @@ -61,7 +61,7 @@ int crypto_sign( #endif #if 0 -void C25519::sign(const C25519::Private &myPrivate,const C25519::Public &myPublic,const void *msg,unsigned int len,void *signature) +void ECC::sign(const ECC::Private &myPrivate,const ECC::Public &myPublic,const void *msg,unsigned int len,void *signature) { sc25519 sck, scs, scsk; ge25519 ger; diff --git a/node/Capability.hpp b/node/Capability.hpp index cc6d28fae..bdcf498b5 100644 --- a/node/Capability.hpp +++ b/node/Capability.hpp @@ -21,7 +21,7 @@ #include "Constants.hpp" #include "Credential.hpp" #include "Address.hpp" -#include "C25519.hpp" +#include "ECC.hpp" #include "Utils.hpp" #include "Buffer.hpp" #include "Identity.hpp" @@ -496,7 +496,7 @@ private: struct { Address to; Address from; - C25519::Signature signature; + ECC::Signature signature; } _custody[ZT_MAX_CAPABILITY_CUSTODY_CHAIN_LENGTH]; }; diff --git a/node/CertificateOfMembership.cpp b/node/CertificateOfMembership.cpp index 83cd3690e..473b3c1d4 100644 --- a/node/CertificateOfMembership.cpp +++ b/node/CertificateOfMembership.cpp @@ -12,7 +12,7 @@ /****/ #include "CertificateOfMembership.hpp" -#include "C25519.hpp" +#include "ECC.hpp" #include "RuntimeEnvironment.hpp" #include "Topology.hpp" #include "Switch.hpp" diff --git a/node/CertificateOfMembership.hpp b/node/CertificateOfMembership.hpp index ea89c84b3..db37721fb 100644 --- a/node/CertificateOfMembership.hpp +++ b/node/CertificateOfMembership.hpp @@ -25,7 +25,7 @@ #include "Credential.hpp" #include "Buffer.hpp" #include "Address.hpp" -#include "C25519.hpp" +#include "ECC.hpp" #include "Identity.hpp" #include "Utils.hpp" @@ -310,7 +310,7 @@ private: Address _signedBy; _Qualifier _qualifiers[ZT_NETWORK_COM_MAX_QUALIFIERS]; unsigned int _qualifierCount; - C25519::Signature _signature; + ECC::Signature _signature; }; } // namespace ZeroTier diff --git a/node/CertificateOfOwnership.hpp b/node/CertificateOfOwnership.hpp index 4dde07b4f..72994b391 100644 --- a/node/CertificateOfOwnership.hpp +++ b/node/CertificateOfOwnership.hpp @@ -21,7 +21,7 @@ #include "Constants.hpp" #include "Credential.hpp" -#include "C25519.hpp" +#include "ECC.hpp" #include "Address.hpp" #include "Identity.hpp" #include "Buffer.hpp" @@ -243,7 +243,7 @@ private: uint8_t _thingValues[ZT_CERTIFICATEOFOWNERSHIP_MAX_THINGS][ZT_CERTIFICATEOFOWNERSHIP_MAX_THING_VALUE_SIZE]; Address _issuedTo; Address _signedBy; - C25519::Signature _signature; + ECC::Signature _signature; }; } // namespace ZeroTier diff --git a/node/C25519.cpp b/node/ECC.cpp similarity index 99% rename from node/C25519.cpp rename to node/ECC.cpp index f425540d8..314cec318 100644 --- a/node/C25519.cpp +++ b/node/ECC.cpp @@ -12,7 +12,7 @@ Derived from public domain code by D. J. Bernstein. #include #include "Constants.hpp" -#include "C25519.hpp" +#include "ECC.hpp" #include "SHA512.hpp" #include "Buffer.hpp" #include "Hashtable.hpp" @@ -2508,7 +2508,7 @@ extern "C" void ed25519_amd64_asm_sign(const unsigned char *sk,const unsigned ch namespace ZeroTier { -void C25519::agree(const C25519::Private &mine,const C25519::Public &their,void *keybuf,unsigned int keylen) +void ECC::agree(const ECC::Private &mine,const ECC::Public &their,void *keybuf,unsigned int keylen) { unsigned char rawkey[32]; unsigned char digest[64]; @@ -2524,7 +2524,7 @@ void C25519::agree(const C25519::Private &mine,const C25519::Public &their,void } } -void C25519::sign(const C25519::Private &myPrivate,const C25519::Public &myPublic,const void *msg,unsigned int len,void *signature) +void ECC::sign(const ECC::Private &myPrivate,const ECC::Public &myPublic,const void *msg,unsigned int len,void *signature) { unsigned char digest[64]; // we sign the first 32 bytes of SHA-512(msg) SHA512(digest,msg,len); @@ -2580,7 +2580,7 @@ void C25519::sign(const C25519::Private &myPrivate,const C25519::Public &myPubli #endif } -bool C25519::verify(const C25519::Public &their,const void *msg,unsigned int len,const void *signature) +bool ECC::verify(const ECC::Public &their,const void *msg,unsigned int len,const void *signature) { const unsigned char *const sig = (const unsigned char *)signature; unsigned char digest[64]; // we sign the first 32 bytes of SHA-512(msg) @@ -2611,14 +2611,14 @@ bool C25519::verify(const C25519::Public &their,const void *msg,unsigned int len return Utils::secureEq(sig,t2,32); } -void C25519::_calcPubDH(C25519::Pair &kp) +void ECC::_calcPubDH(ECC::Pair &kp) { // First 32 bytes of pub and priv are the keys for ECDH key // agreement. This generates the public portion from the private. crypto_scalarmult_base(kp.pub.data,kp.priv.data); } -void C25519::_calcPubED(C25519::Pair &kp) +void ECC::_calcPubED(ECC::Pair &kp) { unsigned char extsk[64]; sc25519 scsk; diff --git a/node/C25519.hpp b/node/ECC.hpp similarity index 96% rename from node/C25519.hpp rename to node/ECC.hpp index d5e84e90f..9e3fc0b94 100644 --- a/node/C25519.hpp +++ b/node/ECC.hpp @@ -11,8 +11,8 @@ */ /****/ -#ifndef ZT_C25519_HPP -#define ZT_C25519_HPP +#ifndef ZT_ECC_HPP +#define ZT_ECC_HPP #include "Utils.hpp" @@ -22,10 +22,7 @@ namespace ZeroTier { #define ZT_ECC_PRIVATE_KEY_SET_LEN 64 #define ZT_ECC_SIGNATURE_LEN 96 -/** - * A combined Curve25519 ECDH and Ed25519 signature engine - */ -class C25519 +class ECC { public: struct Public { uint8_t data[ZT_ECC_PUBLIC_KEY_SET_LEN]; }; @@ -34,7 +31,7 @@ public: struct Pair { Public pub; Private priv; }; /** - * Generate a C25519 elliptic curve key pair + * Generate an elliptic curve key pair */ static inline Pair generate() { diff --git a/node/Identity.cpp b/node/Identity.cpp index b35a2e555..71c4b4ef1 100644 --- a/node/Identity.cpp +++ b/node/Identity.cpp @@ -16,7 +16,7 @@ #include #include -#include "C25519.hpp" +#include "ECC.hpp" #include "Constants.hpp" #include "Identity.hpp" #include "SHA512.hpp" @@ -73,7 +73,7 @@ struct _Identity_generate_cond { _Identity_generate_cond() {} _Identity_generate_cond(unsigned char *sb,char *gm) : digest(sb),genmem(gm) {} - inline bool operator()(const C25519::Pair &kp) const + inline bool operator()(const ECC::Pair &kp) const { _computeMemoryHardHash(kp.pub.data,ZT_ECC_PUBLIC_KEY_SET_LEN,digest,genmem); return (digest[0] < ZT_IDENTITY_GEN_HASHCASH_FIRST_BYTE_LESS_THAN); @@ -87,15 +87,15 @@ void Identity::generate() unsigned char digest[64]; char *genmem = new char[ZT_IDENTITY_GEN_MEMORY]; - C25519::Pair kp; + ECC::Pair kp; do { - kp = C25519::generateSatisfying(_Identity_generate_cond(digest,genmem)); + kp = ECC::generateSatisfying(_Identity_generate_cond(digest,genmem)); _address.setTo(digest + 59,ZT_ADDRESS_LENGTH); // last 5 bytes are address } while (_address.isReserved()); _publicKey = kp.pub; if (!_privateKey) { - _privateKey = new C25519::Private(); + _privateKey = new ECC::Private(); } *_privateKey = kp.priv; @@ -157,7 +157,7 @@ bool Identity::fromString(const char *str) } delete _privateKey; - _privateKey = (C25519::Private *)0; + _privateKey = (ECC::Private *)0; int fno = 0; char *saveptr = (char *)0; @@ -183,7 +183,7 @@ bool Identity::fromString(const char *str) } break; case 3: - _privateKey = new C25519::Private(); + _privateKey = new ECC::Private(); if (Utils::unhex(f,_privateKey->data,ZT_ECC_PRIVATE_KEY_SET_LEN) != ZT_ECC_PRIVATE_KEY_SET_LEN) { _address.zero(); return false; diff --git a/node/Identity.hpp b/node/Identity.hpp index e144fd332..8731096cf 100644 --- a/node/Identity.hpp +++ b/node/Identity.hpp @@ -20,7 +20,7 @@ #include "Constants.hpp" #include "Utils.hpp" #include "Address.hpp" -#include "C25519.hpp" +#include "ECC.hpp" #include "Buffer.hpp" #include "SHA512.hpp" @@ -42,19 +42,19 @@ class Identity { public: Identity() : - _privateKey((C25519::Private *)0) + _privateKey((ECC::Private *)0) { } Identity(const Identity &id) : _address(id._address), _publicKey(id._publicKey), - _privateKey((id._privateKey) ? new C25519::Private(*(id._privateKey)) : (C25519::Private *)0) + _privateKey((id._privateKey) ? new ECC::Private(*(id._privateKey)) : (ECC::Private *)0) { } Identity(const char *str) : - _privateKey((C25519::Private *)0) + _privateKey((ECC::Private *)0) { if (!fromString(str)) { throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_INVALID_TYPE; @@ -63,7 +63,7 @@ public: template Identity(const Buffer &b,unsigned int startAt = 0) : - _privateKey((C25519::Private *)0) + _privateKey((ECC::Private *)0) { deserialize(b,startAt); } @@ -71,7 +71,7 @@ public: ~Identity() { if (_privateKey) { - Utils::burn(_privateKey,sizeof(C25519::Private)); + Utils::burn(_privateKey,sizeof(ECC::Private)); delete _privateKey; } } @@ -82,12 +82,12 @@ public: _publicKey = id._publicKey; if (id._privateKey) { if (!_privateKey) { - _privateKey = new C25519::Private(); + _privateKey = new ECC::Private(); } *_privateKey = *(id._privateKey); } else { delete _privateKey; - _privateKey = (C25519::Private *)0; + _privateKey = (ECC::Private *)0; } return *this; } @@ -109,7 +109,7 @@ public: /** * @return True if this identity contains a private key */ - inline bool hasPrivate() const { return (_privateKey != (C25519::Private *)0); } + inline bool hasPrivate() const { return (_privateKey != (ECC::Private *)0); } /** * Compute a SHA384 hash of this identity's address and public key(s). @@ -144,10 +144,10 @@ public: * @param data Data to sign * @param len Length of data */ - inline C25519::Signature sign(const void *data,unsigned int len) const + inline ECC::Signature sign(const void *data,unsigned int len) const { if (_privateKey) { - return C25519::sign(*_privateKey,_publicKey,data,len); + return ECC::sign(*_privateKey,_publicKey,data,len); } throw ZT_EXCEPTION_PRIVATE_KEY_REQUIRED; } @@ -166,7 +166,7 @@ public: if (siglen != ZT_ECC_SIGNATURE_LEN) { return false; } - return C25519::verify(_publicKey,data,len,signature); + return ECC::verify(_publicKey,data,len,signature); } /** @@ -177,9 +177,9 @@ public: * @param signature Signature * @return True if signature validates and data integrity checks */ - inline bool verify(const void *data,unsigned int len,const C25519::Signature &signature) const + inline bool verify(const void *data,unsigned int len,const ECC::Signature &signature) const { - return C25519::verify(_publicKey,data,len,signature); + return ECC::verify(_publicKey,data,len,signature); } /** @@ -194,7 +194,7 @@ public: inline bool agree(const Identity &id,void *const key) const { if (_privateKey) { - C25519::agree(*_privateKey,id._publicKey,key,ZT_SYMMETRIC_KEY_SIZE); + ECC::agree(*_privateKey,id._publicKey,key,ZT_SYMMETRIC_KEY_SIZE); return true; } return false; @@ -242,7 +242,7 @@ public: inline unsigned int deserialize(const Buffer &b,unsigned int startAt = 0) { delete _privateKey; - _privateKey = (C25519::Private *)0; + _privateKey = (ECC::Private *)0; unsigned int p = startAt; @@ -261,7 +261,7 @@ public: if (privateKeyLength != ZT_ECC_PRIVATE_KEY_SET_LEN) { throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_INVALID_CRYPTOGRAPHIC_TOKEN; } - _privateKey = new C25519::Private(); + _privateKey = new ECC::Private(); memcpy(_privateKey->data,b.field(p,ZT_ECC_PRIVATE_KEY_SET_LEN),ZT_ECC_PRIVATE_KEY_SET_LEN); p += ZT_ECC_PRIVATE_KEY_SET_LEN; } @@ -292,14 +292,14 @@ public: /** * @return C25519 public key */ - inline const C25519::Public &publicKey() const { return _publicKey; } + inline const ECC::Public &publicKey() const { return _publicKey; } /** * @return C25519 key pair (only returns valid pair if private key is present in this Identity object) */ - inline const C25519::Pair privateKeyPair() const + inline const ECC::Pair privateKeyPair() const { - C25519::Pair pair; + ECC::Pair pair; pair.pub = _publicKey; if (_privateKey) { pair.priv = *_privateKey; @@ -323,8 +323,8 @@ public: private: Address _address; - C25519::Public _publicKey; - C25519::Private *_privateKey; + ECC::Public _publicKey; + ECC::Private *_privateKey; }; } // namespace ZeroTier diff --git a/node/Network.cpp b/node/Network.cpp index 4a59eb2af..f9d4ec829 100644 --- a/node/Network.cpp +++ b/node/Network.cpp @@ -18,7 +18,7 @@ #include "../include/ZeroTierDebug.h" -#include "C25519.hpp" +#include "ECC.hpp" #include "Constants.hpp" #include "../version.h" #include "Network.hpp" diff --git a/node/Node.cpp b/node/Node.cpp index 5d1b47afc..3717a8be6 100644 --- a/node/Node.cpp +++ b/node/Node.cpp @@ -19,7 +19,7 @@ #include "../version.h" -#include "C25519.hpp" +#include "ECC.hpp" #include "Constants.hpp" #include "SharedPtr.hpp" #include "Node.hpp" @@ -813,7 +813,7 @@ void Node::ncSendConfig(uint64_t nwid,uint64_t requestPacketId,const Address &de outp.append((uint32_t)totalSize); outp.append((uint32_t)chunkIndex); - C25519::Signature sig(RR->identity.sign(reinterpret_cast(outp.data()) + sigStart,outp.size() - sigStart)); + ECC::Signature sig(RR->identity.sign(reinterpret_cast(outp.data()) + sigStart,outp.size() - sigStart)); outp.append((uint8_t)1); outp.append((uint16_t)ZT_ECC_SIGNATURE_LEN); outp.append(sig.data,ZT_ECC_SIGNATURE_LEN); diff --git a/node/Revocation.hpp b/node/Revocation.hpp index 7c96cdc67..337226249 100644 --- a/node/Revocation.hpp +++ b/node/Revocation.hpp @@ -23,7 +23,7 @@ #include "../include/ZeroTierOne.h" #include "Credential.hpp" #include "Address.hpp" -#include "C25519.hpp" +#include "ECC.hpp" #include "Utils.hpp" #include "Buffer.hpp" #include "Identity.hpp" @@ -201,7 +201,7 @@ private: Address _target; Address _signedBy; Credential::Type _type; - C25519::Signature _signature; + ECC::Signature _signature; }; } // namespace ZeroTier diff --git a/node/Tag.hpp b/node/Tag.hpp index 9a870e6a1..fccc4b52b 100644 --- a/node/Tag.hpp +++ b/node/Tag.hpp @@ -21,7 +21,7 @@ #include "Constants.hpp" #include "Credential.hpp" -#include "C25519.hpp" +#include "ECC.hpp" #include "Address.hpp" #include "Identity.hpp" #include "Buffer.hpp" @@ -207,7 +207,7 @@ private: int64_t _ts; Address _issuedTo; Address _signedBy; - C25519::Signature _signature; + ECC::Signature _signature; }; } // namespace ZeroTier diff --git a/node/World.hpp b/node/World.hpp index bb5c18a67..452771389 100644 --- a/node/World.hpp +++ b/node/World.hpp @@ -21,7 +21,7 @@ #include "InetAddress.hpp" #include "Identity.hpp" #include "Buffer.hpp" -#include "C25519.hpp" +#include "ECC.hpp" /** * Maximum number of roots (sanity limit, okay to increase) @@ -133,12 +133,12 @@ public: /** * @return C25519 signature */ - inline const C25519::Signature &signature() const { return _signature; } + inline const ECC::Signature &signature() const { return _signature; } /** * @return Public key that must sign next update */ - inline const C25519::Public &updatesMustBeSignedBy() const { return _updatesMustBeSignedBy; } + inline const ECC::Public &updatesMustBeSignedBy() const { return _updatesMustBeSignedBy; } /** * Check whether a world update should replace this one @@ -154,7 +154,7 @@ public: if ((_id == update._id)&&(_ts < update._ts)&&(_type == update._type)) { Buffer tmp; update.serialize(tmp,true); - return C25519::verify(_updatesMustBeSignedBy,tmp.data(),tmp.size(),update._signature); + return ECC::verify(_updatesMustBeSignedBy,tmp.data(),tmp.size(),update._signature); } return false; } @@ -262,7 +262,7 @@ public: * @param signWith Key to sign this World with (can have the same public as the next-update signing key, but doesn't have to) * @return Signed World object */ - static inline World make(World::Type t,uint64_t id,uint64_t ts,const C25519::Public &sk,const std::vector &roots,const C25519::Pair &signWith) + static inline World make(World::Type t,uint64_t id,uint64_t ts,const ECC::Public &sk,const std::vector &roots,const ECC::Pair &signWith) { World w; w._id = id; @@ -273,7 +273,7 @@ public: Buffer tmp; w.serialize(tmp,true); - w._signature = C25519::sign(signWith,tmp.data(),tmp.size()); + w._signature = ECC::sign(signWith,tmp.data(),tmp.size()); return w; } @@ -282,8 +282,8 @@ protected: uint64_t _id; uint64_t _ts; Type _type; - C25519::Public _updatesMustBeSignedBy; - C25519::Signature _signature; + ECC::Public _updatesMustBeSignedBy; + ECC::Signature _signature; std::vector _roots; }; diff --git a/objects.mk b/objects.mk index 1d8a6c0a5..3d1cd9273 100644 --- a/objects.mk +++ b/objects.mk @@ -2,7 +2,7 @@ CORE_OBJS=\ node/AES.o \ node/AES_aesni.o \ node/AES_armcrypto.o \ - node/C25519.o \ + node/ECC.o \ node/Capability.o \ node/CertificateOfMembership.o \ node/CertificateOfOwnership.o \ diff --git a/one.cpp b/one.cpp index 32c76dc4d..a99bf4997 100644 --- a/one.cpp +++ b/one.cpp @@ -13,7 +13,7 @@ #ifndef _GNU_SOURCE #define _GNU_SOURCE -#include "node/C25519.hpp" +#include "node/ECC.hpp" #endif #include @@ -1553,7 +1553,7 @@ static int idtool(int argc,char **argv) fprintf(stderr,"%s is not readable" ZT_EOL_S,argv[3]); return 1; } - C25519::Signature signature = id.sign(inf.data(),(unsigned int)inf.length()); + ECC::Signature signature = id.sign(inf.data(),(unsigned int)inf.length()); char hexbuf[1024]; printf("%s",Utils::hex(signature.data,ZT_ECC_SIGNATURE_LEN,hexbuf)); } else if (!strcmp(argv[1],"verify")) { @@ -1603,7 +1603,7 @@ static int idtool(int argc,char **argv) return 1; } - C25519::Pair kp(C25519::generate()); + ECC::Pair kp(ECC::generate()); char idtmp[4096]; nlohmann::json mj; @@ -1647,8 +1647,8 @@ static int idtool(int argc,char **argv) return 1; } - C25519::Pair signingKey; - C25519::Public updatesMustBeSignedBy; + ECC::Pair signingKey; + ECC::Public updatesMustBeSignedBy; Utils::unhex(OSUtils::jsonString(mj["signingKey"],"").c_str(),signingKey.pub.data,ZT_ECC_PUBLIC_KEY_SET_LEN); Utils::unhex(OSUtils::jsonString(mj["signingKey_SECRET"],"").c_str(),signingKey.priv.data,ZT_ECC_PRIVATE_KEY_SET_LEN); Utils::unhex(OSUtils::jsonString(mj["updatesMustBeSignedBy"],"").c_str(),updatesMustBeSignedBy.data,ZT_ECC_PUBLIC_KEY_SET_LEN); diff --git a/selftest.cpp b/selftest.cpp index 0a18caa74..058d9c5f4 100644 --- a/selftest.cpp +++ b/selftest.cpp @@ -36,7 +36,7 @@ #include "node/Peer.hpp" #include "node/Dictionary.hpp" #include "node/SHA512.hpp" -#include "node/C25519.hpp" +#include "node/ECC.hpp" #include "node/Poly1305.hpp" #include "node/CertificateOfMembership.hpp" #include "node/Node.hpp" @@ -361,13 +361,13 @@ static int testCrypto() std::cout << "[crypto] Testing C25519 and Ed25519 against test vectors... "; std::cout.flush(); for(int k=0;kp2 should equal p2<>p1 if (memcmp(buf1,buf2,64)) { std::cout << "FAIL (1)" << std::endl; @@ -414,45 +414,45 @@ static int testCrypto() std::cout << "PASS" << std::endl; std::cout << "[crypto] Benchmarking C25519 ECC key agreement... "; std::cout.flush(); - C25519::Pair bp[8]; + ECC::Pair bp[8]; for(int k=0;k<8;++k) - bp[k] = C25519::generate(); + bp[k] = ECC::generate(); uint64_t st = OSUtils::now(); for(unsigned int k=0;k<50;++k) { - C25519::agree(bp[~k & 7],bp[k & 7].pub,buf1,64); + ECC::agree(bp[~k & 7],bp[k & 7].pub,buf1,64); } uint64_t et = OSUtils::now(); std::cout << ((double)(et - st) / 50.0) << "ms per agreement." << std::endl; std::cout << "[crypto] Testing Ed25519 ECC signatures... "; std::cout.flush(); - C25519::Pair didntSign = C25519::generate(); + ECC::Pair didntSign = ECC::generate(); for(unsigned int i=0;i<10;++i) { - C25519::Pair p1 = C25519::generate(); + ECC::Pair p1 = ECC::generate(); for(unsigned int k=0;k 0) ? "," : ""),(unsigned int)p1.pub.data[i]); diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj index 2dd05aa57..de094bc7b 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj @@ -200,7 +200,7 @@ - + @@ -657,4 +657,4 @@ - \ No newline at end of file + diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters index 1b1bb507a..8087f1de8 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters @@ -335,7 +335,7 @@ Header Files\node - + Header Files\node @@ -572,4 +572,4 @@ Resource Files - \ No newline at end of file + diff --git a/windows/ZeroTierOneSDK/ZeroTierOneSDK.vcxproj b/windows/ZeroTierOneSDK/ZeroTierOneSDK.vcxproj index bc719b6ec..9e3a12707 100644 --- a/windows/ZeroTierOneSDK/ZeroTierOneSDK.vcxproj +++ b/windows/ZeroTierOneSDK/ZeroTierOneSDK.vcxproj @@ -168,7 +168,7 @@ - + @@ -254,4 +254,4 @@ - \ No newline at end of file + diff --git a/windows/ZeroTierOneSDK/ZeroTierOneSDK.vcxproj.filters b/windows/ZeroTierOneSDK/ZeroTierOneSDK.vcxproj.filters index d7e947f3f..7276ba315 100644 --- a/windows/ZeroTierOneSDK/ZeroTierOneSDK.vcxproj.filters +++ b/windows/ZeroTierOneSDK/ZeroTierOneSDK.vcxproj.filters @@ -42,7 +42,7 @@ Header Files - + Header Files @@ -237,4 +237,4 @@ Source Files - \ No newline at end of file +