diff options
| -rwxr-xr-x | .gitignore | 2 | ||||
| -rw-r--r-- | root-topology/Makefile (renamed from topology/Makefile) | 3 | ||||
| -rw-r--r-- | root-topology/README.md | 7 | ||||
| -rw-r--r-- | root-topology/ZT_DEFAULT_ROOT_TOPOLOGY.c (renamed from topology/ZT_DEFAULT_ROOT_TOPOLOGY.c) | 2 | ||||
| -rw-r--r-- | root-topology/bin2c.c (renamed from topology/bin2c.c) | 0 | ||||
| -rw-r--r-- | root-topology/mktopology.cpp (renamed from topology/mktopology.cpp) | 10 | ||||
| -rw-r--r-- | root-topology/root-topology-authority.public (renamed from topology/topology.public) | 0 | ||||
| -rw-r--r-- | root-topology/supernodes/36f63d6574 (renamed from topology/supernodes/36f63d6574) | 0 | ||||
| -rw-r--r-- | root-topology/supernodes/7e19876aba (renamed from topology/supernodes/7e19876aba) | 0 | ||||
| -rw-r--r-- | root-topology/supernodes/8acf059fe3 (renamed from topology/supernodes/8acf059fe3) | 0 | ||||
| -rw-r--r-- | root-topology/supernodes/9d219039f3 (renamed from topology/supernodes/9d219039f3) | 0 | ||||
| -rw-r--r-- | topology/README.md | 9 |
12 files changed, 14 insertions, 19 deletions
@@ -31,4 +31,4 @@ .qmake.stash *.autosave /ZeroTier One.dmg -/topology/topology.secret +/root-topology/*.secret diff --git a/topology/Makefile b/root-topology/Makefile index a78cc9ab..4c256a50 100644 --- a/topology/Makefile +++ b/root-topology/Makefile @@ -11,4 +11,7 @@ official: all clean: rm -f *.o mktopology bin2c root_topology.out +realclean: clean + rm -f ZT_DEFAULT_ROOT_TOPOLOGY.c + FORCE: diff --git a/root-topology/README.md b/root-topology/README.md new file mode 100644 index 00000000..04efc765 --- /dev/null +++ b/root-topology/README.md @@ -0,0 +1,7 @@ +This folder contains the source files to compile the signed network root topology dictionary. Users outside ZeroTier won't find this useful except for testing, since the root topology must be signed by the root topology authority (public identity in root-topology-authority.public) to be considered valid. + +ZT_DEFAULT_ROOT_TOPOLOGY.c contains the current default value, and this URL is periodically checked for updates: + +http://download.zerotier.com/sys/topology + +Obviously nothing prevents OSS users from replacing this topology with their own, changing the hard coded topology signing identity and update URL in Defaults, and signing their own dictionary. But doing so would yield a network that would have a tough(ish) time talking to the main one. Since the main network is a free service, why bother? (Except for building testnets, which ZeroTier already does for internal testing.) diff --git a/topology/ZT_DEFAULT_ROOT_TOPOLOGY.c b/root-topology/ZT_DEFAULT_ROOT_TOPOLOGY.c index 905a419c..0d313120 100644 --- a/topology/ZT_DEFAULT_ROOT_TOPOLOGY.c +++ b/root-topology/ZT_DEFAULT_ROOT_TOPOLOGY.c @@ -94,6 +94,6 @@ static unsigned char ZT_DEFAULT_ROOT_TOPOLOGY[] = { 0x34, 0x32, 0x38, 0x33, 0x37, 0x33, 0x35, 0x38, 0x32, 0x64, 0x61, 0x33, 0x64, 0x30, 0x61, 0x39, 0x61, 0x31, 0x34, 0x62, 0x33, 0x36, 0x65, 0x34, 0x35, 0x34, 0x36, 0x63, 0x33, 0x31, 0x37, 0x65, 0x38, 0x31, 0x31, 0x65, 0x36, 0x0a, 0x7e, 0x21, 0x73, 0x69, 0x67, 0x74, 0x73, 0x3d, 0x31, 0x34, - 0x37, 0x62, 0x32, 0x66, 0x37, 0x30, 0x34, 0x37, 0x34, 0x0a + 0x37, 0x62, 0x32, 0x66, 0x62, 0x65, 0x66, 0x38, 0x35, 0x0a }; #define ZT_DEFAULT_ROOT_TOPOLOGY_LEN 1530 diff --git a/topology/bin2c.c b/root-topology/bin2c.c index 91ce7d14..91ce7d14 100644 --- a/topology/bin2c.c +++ b/root-topology/bin2c.c diff --git a/topology/mktopology.cpp b/root-topology/mktopology.cpp index b1d53683..516fd71b 100644 --- a/topology/mktopology.cpp +++ b/root-topology/mktopology.cpp @@ -1,9 +1,3 @@ -/* Makes topology dictionary out of source dictionary and signs with - * 'topology.secret', which must be present (or symlinked) from where - * this is run. */ - -/* Just type 'make' and then run (Only tested on Linux) */ - #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -22,8 +16,8 @@ int main(int argc,char **argv) { std::string buf; - if (!Utils::readFile("topology.secret",buf)) { - std::cerr << "Cannot read topology.secret" << std::endl; + if (!Utils::readFile("root-topology-authority.secret",buf)) { + std::cerr << "Cannot read root-topology-authority.secret" << std::endl; return 1; } Identity topologyAuthority(buf); diff --git a/topology/topology.public b/root-topology/root-topology-authority.public index 7897b616..7897b616 100644 --- a/topology/topology.public +++ b/root-topology/root-topology-authority.public diff --git a/topology/supernodes/36f63d6574 b/root-topology/supernodes/36f63d6574 index b90ba8be..b90ba8be 100644 --- a/topology/supernodes/36f63d6574 +++ b/root-topology/supernodes/36f63d6574 diff --git a/topology/supernodes/7e19876aba b/root-topology/supernodes/7e19876aba index 23c2ad24..23c2ad24 100644 --- a/topology/supernodes/7e19876aba +++ b/root-topology/supernodes/7e19876aba diff --git a/topology/supernodes/8acf059fe3 b/root-topology/supernodes/8acf059fe3 index 438e67a3..438e67a3 100644 --- a/topology/supernodes/8acf059fe3 +++ b/root-topology/supernodes/8acf059fe3 diff --git a/topology/supernodes/9d219039f3 b/root-topology/supernodes/9d219039f3 index 5b21cf62..5b21cf62 100644 --- a/topology/supernodes/9d219039f3 +++ b/root-topology/supernodes/9d219039f3 diff --git a/topology/README.md b/topology/README.md deleted file mode 100644 index 69ec3fc7..00000000 --- a/topology/README.md +++ /dev/null @@ -1,9 +0,0 @@ -This folder contains the source files to compile the signed network topology dictionary. Users outside ZeroTier won't find this useful except for documentation purposes, since this dictionary must be signed by a valid topology signing key to be considered valid. These keys are hard-coded into the source and distributed with all versions of the app. - -A default value for this dictionary is included in node/Defaults.cpp, and the following URL is periodically checked for updates: - -http://download.zerotier.com/sys/topology - -Obviously nothing prevents OSS users from replacing this topology with their own, changing the hard coded topology signing identity and update URL in Defaults, and signing their own dictionary. But doing so would yield a network that would have a tough(ish) time talking to the main one. Since the main network is a free service, why bother? (Except for building testnets, which ZeroTier already does for internal testing.) - -Increasing decentralization via federation or trust network is possible in the future though, provided it can be done without sacrificing stability, security, performance, or ease of use. |