Commit Graph

5998 Commits

Author SHA1 Message Date
Grant Limberg
4d26b5a868 no reason for this to be a pointer 2021-10-05 17:02:50 -07:00
Grant Limberg
ac0dc7844f rework commit thread & some connection pool borrowing issues 2021-10-05 09:25:24 -07:00
Grant Limberg
27e3597d5e Merge branch 'dev' into central-controller 2021-10-01 11:30:23 -07:00
Joseph Henry
9e8de2a702 Compilation fix 2021-10-01 11:19:04 -07:00
Joseph Henry
165757176a Potential fix fro deadlock bug 2021-10-01 11:11:20 -07:00
Grant Limberg
a411b83a65 remove strip calls from linux makefile 2021-10-01 09:05:35 -07:00
rjsocha
12900d914a Merge branch 'zerotier:master' into win-service-description 2021-09-29 15:47:55 +02:00
Sean OMeara
190e9464ce adding commit message linter 2021-09-28 17:15:44 +02:00
Sean OMeara
57dd26baa9 adding commit linter 2021-09-28 17:06:50 +02:00
Adam Ierymenko
19f3a97a8d More reverting of dumb PR 2021-09-23 19:02:38 -04:00
Adam Ierymenko
375e5ee7dd Revert stupid spam PR AGAIN 2021-09-23 18:59:48 -04:00
Grant Limberg
05df378dce clear variables between gets for dump 2021-09-22 16:13:54 -07:00
Adam Ierymenko
f1efea6800 Merge branch 'master' of github.com:zerotier/ZeroTierOne 2021-09-22 13:26:45 -04:00
Adam Ierymenko
eb1cafcd01 Windows installer. 2021-09-22 10:43:53 -04:00
Adam Ierymenko
81de6d2dfa Merge branch 'dev' of http://10.95.0.64/zerotier/ZeroTierOne into dev 2021-09-22 10:31:17 -04:00
Adam Ierymenko
9e38c31b64 Windows installer fun. 2021-09-22 10:31:07 -04:00
Adam Ierymenko
7d1f447458 Build fix. 2021-09-22 09:20:53 -04:00
Adam Ierymenko
1b66a1cd2f Version bump. 2021-09-21 14:26:00 -04:00
Adam Ierymenko
eabe091038 Backport only the COM mitigation instead of everything from 1.8 2021-09-21 14:14:34 -04:00
Adam Ierymenko
b403f106fb Revert "Use a faster method of fingerprinting identities."
This reverts commit b72e5e8386.
2021-09-21 09:57:08 -07:00
Adam Ierymenko
75a45eeb27 Revert "Backport guts of 1.8 to 1.6 tree so we can point release without waiting for UI quirks to be fixed."
This reverts commit 48ce7632fa.
2021-09-21 11:51:26 -04:00
Adam Ierymenko
452b1e806b Revert "Version bump, backport one more fix."
This reverts commit 9f9a870399.
2021-09-21 11:51:10 -04:00
Adam Ierymenko
9f9a870399 Version bump, backport one more fix. 2021-09-21 11:31:25 -04:00
Adam Ierymenko
48ce7632fa Backport guts of 1.8 to 1.6 tree so we can point release without waiting for UI quirks to be fixed. 2021-09-21 11:20:15 -04:00
Adam Ierymenko
30d5d5a892 Revert "Don't assume roots validated the identity, just in case they did not."
This reverts commit 39b97f9163.
2021-09-20 19:27:01 -07:00
Adam Ierymenko
9bc79f94df Revert "Don't assume roots validated the identity, just in case they did not."
This reverts commit 39b97f9163.
2021-09-20 22:05:49 -04:00
Adam Ierymenko
a0239e17e9 Revert "Use a faster method of fingerprinting identities."
This reverts commit b72e5e8386.
2021-09-20 22:05:39 -04:00
Adam Ierymenko
c8a58b4b04 Use a faster method of fingerprinting identities. 2021-09-20 17:05:23 -07:00
Adam Ierymenko
b72e5e8386 Use a faster method of fingerprinting identities. 2021-09-20 20:02:39 -04:00
Adam Ierymenko
565885a4c0 Remove ancient controller support.
# Conflicts:
#	RELEASE-NOTES.md
2021-09-20 15:41:57 -07:00
Adam Ierymenko
134d33c218 Add a bit of hardening in the network certificate of membership by incorporating a full hash of the identity to which it is issued. This means the recipient need not depend entirely on the root verifying identities properly to make sure impersonation is not occurring. 2021-09-20 15:40:55 -07:00
Adam Ierymenko
9cfb807fcb Don't assume roots validated the identity, just in case they did not. 2021-09-20 15:40:44 -07:00
Grant Limberg
46adc1f059 ifdef this out 2021-09-20 15:39:53 -07:00
Grant Limberg
9002555596 ensure count > 0 2021-09-20 15:39:44 -07:00
Grant Limberg
3b375b55c2 fix central docker launch without redis 2021-09-20 15:39:14 -07:00
Adam Ierymenko
3f49570f45 Remove ancient controller support. 2021-09-20 18:38:29 -04:00
Adam Ierymenko
7c3166e9be Add a bit of hardening in the network certificate of membership by incorporating a full hash of the identity to which it is issued. This means the recipient need not depend entirely on the root verifying identities properly to make sure impersonation is not occurring. 2021-09-20 18:26:49 -04:00
Adam Ierymenko
39b97f9163 Don't assume roots validated the identity, just in case they did not. 2021-09-20 16:15:59 -04:00
channelbeta
af79be5002 Update PGP keyserver URL 2021-09-20 13:51:41 -03:00
Grant Limberg
a20a290836 ifdef this out 2021-09-15 15:27:29 -07:00
Adam Ierymenko
e822463916 Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev 2021-09-15 13:31:22 -04:00
Adam Ierymenko
d2c3ea6901 Another route fix on BSD. 2021-09-15 13:31:18 -04:00
Grant Limberg
83265768c1 ensure count > 0 2021-09-15 09:45:10 -07:00
Grant Limberg
27ce787fbd fix central docker launch without redis 2021-09-15 09:21:41 -07:00
Adam Ierymenko
9c6ec2c52e Version bump. 2021-09-15 11:55:07 -04:00
Adam Ierymenko
3a4425fd4e Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev 2021-09-15 11:51:09 -04:00
Adam Ierymenko
6bb1598fa3 Another fix for routing and interface issues on MacOS 2021-09-15 11:50:54 -04:00
Sean OMeara
4eb6a4286e using json.hpp 3.10.2 2021-09-15 08:21:45 +02:00
Sean OMeara
a9942ca412 more RELEASE-NOTES 2021-09-15 08:12:25 +02:00
Joseph Henry
8d21ae9813 Merge branch 'dev' of https://github.com/zerotier/zerotierone into dev 2021-09-10 13:26:54 -07:00