diff options
| -rw-r--r-- | node/Defaults.cpp | 6 | ||||
| -rw-r--r-- | selftest-crypto-vectors.hpp | 4 | ||||
| -rw-r--r-- | selftest.cpp | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/node/Defaults.cpp b/node/Defaults.cpp index 18b2bdb5..e7afe2c9 100644 --- a/node/Defaults.cpp +++ b/node/Defaults.cpp @@ -53,21 +53,21 @@ static inline std::map< Identity,std::vector<InetAddress> > _mkSupernodeMap() // cthulhu.zerotier.com - New York, New York, USA addrs.clear(); - if (!id.fromString("21e93d708a:0:f6bfe55675a3e66f6169eefc73187a64693a994ede68eba75c9ea65818730a2b03da67a41ce7023a68e5fcd44087529c123e802f510ee00dc9162244ccd63a88")) + if (!id.fromString("8acf059fe3:0:482f6ee5dfe902319b419de5bdc765209c0ecda38c4d6e4fcf0d33658398b4527dcd22f93112fb9befd02fd78bf7261b333fc105d192a623ca9e50fc60b374a5")) throw std::runtime_error("invalid identity in Defaults"); addrs.push_back(InetAddress("198.199.73.93",ZT_DEFAULT_UDP_PORT)); sn[id] = addrs; // nyarlathotep.zerotier.com - San Francisco, California, USA addrs.clear(); - if (!id.fromString("d383d43143:0:7f6fe9386bf67de895869a8a949dad651c1003d3ffb382e9971f9a1ab1513f451ecfe00c6a1c45998ab9fc9a4b4f88f06651d9323752d75eaa2a44a10125e79d")) + if (!id.fromString("7e19876aba:0:2a6e2b2318930f60eb097f70d0f4b028b2cd6d3d0c63c014b9039ff35390e41181f216fb2e6fa8d95c1ee9667156411905c3dccfea78d8c6dfafba688170b3fa")) throw std::runtime_error("invalid identity in Defaults"); addrs.push_back(InetAddress("198.199.97.220",ZT_DEFAULT_UDP_PORT)); sn[id] = addrs; // shub-niggurath.zerotier.com - Amsterdam, Netherlands addrs.clear(); - if (!id.fromString("b6179d3e54:0:e4c7ac071b0ed0820da9cec34a5269398e7fa304bf7ded8faef8f929b247be1a6e0acc0f1ff8e6159f53fc94a797b05e27357891db854f693025e94582d8206d")) + if (!id.fromString("36f63d6574:0:67a776487a1a99b32f413329f2b67c43fbf6152e42c6b66e89043e69d93e48314c7d709b58a83016bd2612dd89400b856e18c553da94892f7d3ca16bf2c92c24")) throw std::runtime_error("invalid identity in Defaults"); addrs.push_back(InetAddress("198.211.127.172",ZT_DEFAULT_UDP_PORT)); sn[id] = addrs; diff --git a/selftest-crypto-vectors.hpp b/selftest-crypto-vectors.hpp index 89c7ae2d..35889709 100644 --- a/selftest-crypto-vectors.hpp +++ b/selftest-crypto-vectors.hpp @@ -3,8 +3,8 @@ #ifndef _ZT_SELFTEST_CRYPTO_VECTORS_H #define _ZT_SELFTEST_CRYPTO_VECTORS_H -#define KNOWN_GOOD_IDENTITY "a9b80c817b:0:c75cbb40e9c3b166ce5058e15bc939f5ef6f0249b3a98d58587ad25a818e486a4a8a31b0f0c5bff5f7da77be7a006b0112877d255b206ff2cd9f1e089f0e1070:c9d5b686aaa308f97d868c588d9e6e2187816d780911fd2ffcc38fa911df180cc96756e3619d33e8ec00c57e4c45112ec81c96615fc62a71795c9a4dba777cb4" -#define KNOWN_BAD_IDENTITY "a9b81c817b:0:c75cbb40e9c3b166ce5058e15bc939f5ef6f0249b3a98d58587ad25a818e486a4a8a31b0f0c5bff5f7da77be7a006b0112877d255b206ff2cd9f1e089f0e1070:c9d5b686aaa308f97d868c588d9e6e2187816d780911fd2ffcc38fa911df180cc96756e3619d33e8ec00c57e4c45112ec81c96615fc62a71795c9a4dba777cb4" +#define KNOWN_GOOD_IDENTITY "8e4df28b72:0:ac3d46abe0c21f3cfe7a6c8d6a85cfcffcb82fbd55af6a4d6350657c68200843fa2e16f9418bbd9702cae365f2af5fb4c420908b803a681d4daef6114d78a2d7:bd8dd6e4ce7022d2f812797a80c6ee8ad180dc4ebf301dec8b06d1be08832bddd63a2f1cfa7b2c504474c75bdc8898ba476ef92e8e2d0509f8441985171ff16e" +#define KNOWN_BAD_IDENTITY "9e4df28b72:0:ac3d46abe0c21f3cfe7a6c8d6a85cfcffcb82fbd55af6a4d6350657c68200843fa2e16f9418bbd9702cae365f2af5fb4c420908b803a681d4daef6114d78a2d7:bd8dd6e4ce7022d2f812797a80c6ee8ad180dc4ebf301dec8b06d1be08832bddd63a2f1cfa7b2c504474c75bdc8898ba476ef92e8e2d0509f8441985171ff16e" static const unsigned char s20TV0Key[32] = { 0x0f,0x62,0xb5,0x08,0x5b,0xae,0x01,0x54,0xa7,0xfa,0x4d,0xa0,0xf3,0x46,0x99,0xec,0x3f,0x92,0xe5,0x38,0x8b,0xde,0x31,0x84,0xd7,0x2a,0x7d,0xd0,0x23,0x76,0xc9,0x1c }; static const unsigned char s20TV0Iv[8] = { 0x28,0x8f,0xf6,0x5d,0xc4,0x2b,0x92,0xf9 }; diff --git a/selftest.cpp b/selftest.cpp index 76428a1e..200dd3a7 100644 --- a/selftest.cpp +++ b/selftest.cpp @@ -215,7 +215,6 @@ static int testIdentity() Identity id; Buffer<512> buf; -#if 0 std::cout << "[identity] Validate known-good identity... "; std::cout.flush(); if (!id.fromString(KNOWN_GOOD_IDENTITY)) { std::cout << "FAIL (1)" << std::endl; @@ -237,7 +236,6 @@ static int testIdentity() return -1; } std::cout << "PASS (i.e. it failed)" << std::endl; -#endif for(unsigned int k=0;k<4;++k) { std::cout << "[identity] Generate identity... "; std::cout.flush(); |