From 051292f4613242097b60d6c3b06e6e550f098419 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Fri, 23 Sep 2022 16:56:49 -0400
Subject: [PATCH] Re-enable real root set.

---
 .../default-rootset/root.zerotier.com.bin     | Bin 750 -> 754 bytes
 .../default-rootset/root.zerotier.com.json    |  20 +++++++++++-------
 network-hypervisor/src/vl1/rootset.rs         |   4 ++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/network-hypervisor/default-rootset/root.zerotier.com.bin b/network-hypervisor/default-rootset/root.zerotier.com.bin
index d167c3d5004ef63f419e50c0b990d2338a8539e2..6ab8305e3d4c4b79dbf6e4b8e5caef77256fc23f 100644
GIT binary patch
delta 288
zcmV+*0pI@a1@Z-utU?mo2nextFm(&5vg}#(&Uy@9r37t03vxH?62kLB^t`0rj87^-
zFv4<hskN_I$Tgp3_p>CvlQm{)Z$r_n90`B`k?m<hOchU<hG)>D4=DeXNZ}10mVChB
z<Yu@A-cFGEU*735eSeoY1Eq!PxODM}7kvbZ1V9V%;i4A`83vufPV3|gfB=)10ck>Q
z090;ZI*wqLyl$A`P-*)_S$RKBU^}FZ7N8_Mwzss&j{KH!Lee&u1o9Mns-N{c8P|<g
zX9s)5IEsHgLaGgb0FyxiX+;I>#hPAISm6k*Nhs$L`R5#nRHcgeDM!}?m5`xI`H>u1
mRDApJz2od4s@j=@Yi(!(>#c7GvG;kR%-qN??F4`T0DypEe~7~X

delta 284
zcmV+%0ptGi1?~lqtU>$y;y7Ctimyo`T+Wu*`48^vXNy!Xn*eq3<|+&@d<Th#k4XIe
zLxMzN)@rNd%^O6wC=?hJyb-TTaQzeleFcD#?rA|D(q<usx{vr;$v_iYyRgCNviJ(W
zpkHqdwjhlDh4I}698HdW#UX_0B|M%f6nO+}1~$*Rf;4th{YIuNj&A{glbHc&L7>_h
z25o8}O&tM0NBAY;)jCJczc+T`bzE=_Ic&P1#exkAv|-&aaTZE0q&?Zk460v3OgcAi
zujK&l^yTI!3V@SD0%=4BL%hUG#m&gk7Wjbcu;_O=Mp>OnUZ!mSX&PzQ2|uoq<?zlF
iU7=0frV&b~qUx4Xq&#f8!@ns#8C{8c7n})z0DypHb%dP&

diff --git a/network-hypervisor/default-rootset/root.zerotier.com.json b/network-hypervisor/default-rootset/root.zerotier.com.json
index 942e7ac5e..8d1714f94 100644
--- a/network-hypervisor/default-rootset/root.zerotier.com.json
+++ b/network-hypervisor/default-rootset/root.zerotier.com.json
@@ -5,22 +5,26 @@
   "members": [ {
       "identity": "62f865ae71:0:e2076c57de870e6288d7d5e7404408b1545efca37d67f77b87e9e54168c25d3ef1a9abf2905ea5e785c01dff23887ad4232d95c7a8fd2c27111a72bd159322dc",
       "endpoints": [ "udp:50.7.252.138/9993", "udp:2001:49f0:d0db:2::2/9993" ],
-      "signature": [ 1, 251, 252, 226, 56, 91, 22, 138, 175, 73, 34, 92, 206, 150, 216, 249, 15, 238, 235, 103, 139, 84, 47, 155, 0, 117, 241, 230, 42, 12, 48, 124, 7, 137, 135, 143, 72, 252, 253, 67, 130, 68, 98, 214, 106, 171, 228, 205, 27, 68, 183, 40, 20, 24, 20, 188, 17, 175, 74, 112, 253, 20, 2, 125, 5 ],
-      "priority": 0
+      "signature": [ 1, 18, 219, 8, 8, 177, 117, 48, 117, 11, 169, 178, 236, 89, 244, 206, 122, 12, 94, 165, 4, 109, 62, 11, 114, 55, 236, 18, 194, 243, 66, 244, 188, 164, 222, 140, 79, 42, 65, 48, 194, 114, 112, 169, 181, 175, 88, 200, 53, 159, 101, 247, 179, 36, 190, 147, 53, 102, 106, 111, 67, 209, 172, 28, 9 ],
+      "priority": 0,
+      "protocol_version": 0
     }, {
       "identity": "778cde7190:0:3f6681a99e5ad1895e9fba33e6212d4454e168bcec7112101bf000956ed8e92e42892cb6f2ec410881a84ab19da50e1287ba3d926c3a1f755cccf299a1207055",
       "endpoints": [ "udp:103.195.103.66/9993", "udp:2605:9880:400:c3:254:f2bc:a1f7:19/9993" ],
-      "signature": [ 1, 30, 210, 102, 33, 134, 186, 143, 248, 90, 201, 64, 19, 90, 187, 176, 193, 232, 178, 248, 10, 191, 160, 95, 111, 13, 182, 32, 140, 254, 133, 241, 221, 6, 28, 77, 142, 125, 197, 33, 132, 233, 37, 60, 158, 41, 20, 121, 4, 108, 6, 54, 207, 185, 130, 52, 118, 83, 253, 70, 166, 44, 142, 111, 1 ],
-      "priority": 0
+      "signature": [ 1, 76, 21, 79, 152, 134, 103, 208, 163, 15, 40, 255, 148, 72, 225, 13, 30, 150, 124, 192, 225, 228, 102, 184, 6, 222, 78, 144, 250, 95, 222, 233, 50, 125, 127, 151, 56, 3, 165, 133, 234, 184, 116, 241, 137, 23, 125, 4, 138, 4, 64, 11, 241, 225, 162, 23, 10, 25, 6, 157, 193, 78, 235, 228, 11 ],
+      "priority": 0,
+      "protocol_version": 0
     }, {
       "identity": "cafe04eba9:0:6c6a9d1dea55c1616bfe2a2b8f0ff9a8cacaf70374fb1f39e3bef81cbfebef17b7228268a0a2a29d3488c752565c6c965cbd6506ec24397cc8a5d9d15285a87f",
       "endpoints": [ "udp:84.17.53.155/9993", "udp:2a02:6ea0:d405::9993/9993" ],
-      "signature": [ 1, 160, 218, 25, 6, 109, 106, 32, 77, 29, 1, 63, 71, 248, 37, 226, 213, 58, 71, 206, 191, 55, 118, 226, 117, 92, 112, 13, 57, 108, 186, 160, 197, 130, 13, 10, 180, 97, 221, 48, 113, 22, 74, 46, 164, 61, 217, 199, 12, 170, 95, 66, 76, 58, 55, 110, 175, 229, 0, 238, 244, 229, 230, 39, 10 ],
-      "priority": 0
+      "signature": [ 1, 109, 0, 84, 110, 96, 58, 142, 96, 150, 188, 110, 152, 225, 80, 105, 251, 68, 89, 121, 63, 78, 96, 59, 164, 141, 22, 160, 36, 59, 182, 183, 180, 201, 142, 252, 150, 113, 66, 210, 54, 151, 4, 242, 20, 123, 170, 159, 245, 59, 25, 215, 141, 86, 103, 7, 123, 197, 56, 138, 127, 61, 66, 170, 13 ],
+      "priority": 0,
+      "protocol_version": 0
     }, {
       "identity": "cafe9efeb9:0:ccdef76bc7b97ded904eabc5df09886d9c1514a610036cb9139cc214001a2958978efcec15712dd3948c6e6b3a8e893df01ff493d1f8d9806a860c5420571bf0",
       "endpoints": [ "udp:104.194.8.134/9993", "udp:2605:9880:200:1200:30:571:e34:51/9993" ],
-      "signature": [ 1, 6, 67, 188, 196, 75, 197, 205, 200, 209, 22, 248, 128, 235, 176, 232, 119, 57, 70, 89, 157, 73, 94, 166, 108, 255, 105, 26, 105, 215, 9, 63, 174, 146, 229, 240, 206, 20, 93, 161, 77, 220, 166, 17, 74, 167, 162, 234, 150, 82, 164, 60, 108, 186, 195, 191, 41, 61, 25, 93, 137, 123, 23, 156, 9 ],
-      "priority": 0
+      "signature": [ 1, 5, 236, 197, 154, 94, 83, 88, 225, 8, 173, 73, 40, 231, 17, 249, 231, 28, 136, 84, 165, 138, 248, 41, 71, 215, 4, 149, 144, 161, 74, 249, 145, 28, 89, 84, 124, 251, 240, 189, 227, 236, 32, 170, 218, 153, 131, 107, 109, 104, 2, 235, 173, 111, 7, 177, 247, 121, 162, 204, 220, 200, 47, 237, 4 ],
+      "priority": 0,
+      "protocol_version": 0
     } ]
 }
diff --git a/network-hypervisor/src/vl1/rootset.rs b/network-hypervisor/src/vl1/rootset.rs
index b710273d4..da7f75146 100644
--- a/network-hypervisor/src/vl1/rootset.rs
+++ b/network-hypervisor/src/vl1/rootset.rs
@@ -94,8 +94,8 @@ impl RootSet {
     /// Get the ZeroTier default root set, which contains roots run by ZeroTier Inc.
     pub fn zerotier_default() -> Verified<Self> {
         let mut cursor = 0;
-        //let rs = include_bytes!("../../default-rootset/root.zerotier.com.bin");
-        let rs = include_bytes!("../../default-rootset/test-root.bin");
+        let rs = include_bytes!("../../default-rootset/root.zerotier.com.bin");
+        //let rs = include_bytes!("../../default-rootset/test-root.bin");
         let rs = Self::unmarshal(&Buffer::from(rs), &mut cursor).unwrap();
         rs.verify().unwrap()
     }