@@@ testing

diff --git a/mdw-test/alice.conf b/mdw-test/alice.conf
index 61ed1cc..be718d5 100644 (file)
--- a/mdw-test/alice.conf
+++ b/mdw-test/alice.conf
@@ -8,3 +8,35 @@ secnet-address = "10.1.0.1";
 service-name = "alice-to-bob";
 
 include secnet.conf
+hack { include sites.conf };
+
+## Hack hack hack.
+vpn-data {
+  mdw-test {
+    hash = sha1;
+    dh = x25519,
+      diffie-hellman("ef1233764fabef4f216f957871e7e9eda5a82d31aa1036ec54dd1d7f1dc6d15918370ebea703adbecf8ef48ca4760b555504b58eeadfe7ccfea8966096701434480dae0477537b1e8c56771b26742688a3804314ddbcd9121d21d1cdeb0574ab4f487a68b287e760305a8557d4b81aac36505ef206715e01ba581b4fed24f1806dc81051cedcbf78547574ef699f24b2aa02b0ae6d8dab4091795ed6ee95bf3120c8a7c7e607f4611b58f83bc0acde50a5345ff570366a2a3994b5ec09f1bb95a900f4b28ffd1b75336be514aaff162c810c35d65924710780f0954168d45a78179dbe496cd26fbc038846cbf054d8ae69bda87698a836866bde3d2c2aa4d7a2fb9a6cc3330d06f1e83e859f585f1612dd389badad41370a8d955dfd98ff241b0227130656b959962fc29e9721f7112bde43b4d09eb29db1ffac0a37ee25dbe99e1c4ea9bc23210971d2f02d8bc000f3caa711a6bab24ceab5022af119361bcb59b0c070989c8fb1ef005cef2aa988dabe9a822c082c374e15a94d8a0acd4a03",
+       "5418fc17aa90e9f025db7015c68748c63b021df235eb3f8dfc7a28bbfa0a119da168be262b639df2c285238713ef31075379dd4342ce526520e6b6d7d073509d1ff893dfed769536483228b89c00ec3b66b355d0158167e0f3bf67f34fdcbb40ffdd87d3cea8bc0723560d276f378301d120cb6ff5124ed325f1f7a93516f7f23ec5ba41a090a3c720f4a49bc2345304fd4683144f2b6970ee14e19dd75b95ce2273811de39cad185981eb5247f5049ae268390e1f54008fd052d1b6c07b5d93636db66a08de861cc4463512170c258221eb599ae595116274a71983f6e1f127609ca2114b244786b1648c0b9a7b4eb43073034fd19efce1f755b2e572d682176083eabfeba0bb5605de0c5c5ea01d6244284872a7f7e9a88105cde69c017590765ff24a62001b7674c39ee10260e440f56ab749fe352a3eb84b94981166e7a63bd294333668fcf9aa09ac7f133760a9d177d28bdfa4ee254dee39fa845a0230d6cf04384678970a88e20e829645e22fca339083803eb107282d0b4afd377e9a");
+    alice = {
+      alice = {
+       hack = hack/vpn-data/mdw-test/alice/alice;
+       name = hack/name;
+       key = hack/key;
+       address = hack/address; port = hack/port;
+       link = hack/link;
+      };
+    };
+    bob = {
+      bob = {
+       hack = hack/vpn-data/mdw-test/bob/bob;
+       name = hack/name;
+       key = hack/key;
+       address = hack/address; port = hack/port;
+       link = hack/link;
+      };
+    };
+  };
+};
+all-sites = vpn-data/mdw-test/alice/alice, vpn-data/mdw-test/bob/bob;
+
+sites = map(site, all-sites);

diff --git a/mdw-test/bob.conf b/mdw-test/bob.conf
index c984d3e..12c21ac 100644 (file)
--- a/mdw-test/bob.conf
+++ b/mdw-test/bob.conf
@@ -8,3 +8,5 @@ secnet-address = "10.2.0.1";
 service-name = "bob-to-alice";
 
 include secnet.conf
+include sites.conf
+sites = map(site, all-sites);

diff --git a/mdw-test/secnet.conf b/mdw-test/secnet.conf
index b66603f..b355057 100644 (file)
--- a/mdw-test/secnet.conf
+++ b/mdw-test/secnet.conf
@@ -6,11 +6,10 @@ random = randomfile("/dev/urandom");
 transform = eax-serpent { };
 system = { };
 
+log-events = "all";
+
 netlink = userv-ipif {
        local-address = "1.0.0.0";
        userv-path = "./fake-userv-ipif";
        buffer = sysbuffer();
 };
-
-include sites.conf
-sites = map(site, all-sites);

diff --git a/mdw-test/sites b/mdw-test/sites
index f944ba7..8bc66db 100644 (file)
--- a/mdw-test/sites
+++ b/mdw-test/sites
@@ -29,8 +29,9 @@ hash sha1
 ## Also, 2^{p-1} == 1 (mod p), and gcd(2^{(p-1)/q_i} - 1, p) == 1 for each
 ## 0 <= i < 12, so p is prime by Pocklington's theorem.  Finally, set q =
 ## q_0, and g = 2^{(p-1)/q}, so that g has order q in GF(p)^*.
-dh ef1233764fabef4f216f957871e7e9eda5a82d31aa1036ec54dd1d7f1dc6d15918370ebea703adbecf8ef48ca4760b555504b58eeadfe7ccfea8966096701434480dae0477537b1e8c56771b26742688a3804314ddbcd9121d21d1cdeb0574ab4f487a68b287e760305a8557d4b81aac36505ef206715e01ba581b4fed24f1806dc81051cedcbf78547574ef699f24b2aa02b0ae6d8dab4091795ed6ee95bf3120c8a7c7e607f4611b58f83bc0acde50a5345ff570366a2a3994b5ec09f1bb95a900f4b28ffd1b75336be514aaff162c810c35d65924710780f0954168d45a78179dbe496cd26fbc038846cbf054d8ae69bda87698a836866bde3d2c2aa4d7a2fb9a6cc3330d06f1e83e859f585f1612dd389badad41370a8d955dfd98ff241b0227130656b959962fc29e9721f7112bde43b4d09eb29db1ffac0a37ee25dbe99e1c4ea9bc23210971d2f02d8bc000f3caa711a6bab24ceab5022af119361bcb59b0c070989c8fb1ef005cef2aa988dabe9a822c082c374e15a94d8a0acd4a03 5418fc17aa90e9f025db7015c68748c63b021df235eb3f8dfc7a28bbfa0a119da168be262b639df2c285238713ef31075379dd4342ce526520e6b6d7d073509d1ff893dfed769536483228b89c00ec3b66b355d0158167e0f3bf67f34fdcbb40ffdd87d3cea8bc0723560d276f378301d120cb6ff5124ed325f1f7a93516f7f23ec5ba41a090a3c720f4a49bc2345304fd4683144f2b6970ee14e19dd75b95ce2273811de39cad185981eb5247f5049ae268390e1f54008fd052d1b6c07b5d93636db66a08de861cc4463512170c258221eb599ae595116274a71983f6e1f127609ca2114b244786b1648c0b9a7b4eb43073034fd19efce1f755b2e572d682176083eabfeba0bb5605de0c5c5ea01d6244284872a7f7e9a88105cde69c017590765ff24a62001b7674c39ee10260e440f56ab749fe352a3eb84b94981166e7a63bd294333668fcf9aa09ac7f133760a9d177d28bdfa4ee254dee39fa845a0230d6cf04384678970a88e20e829645e22fca339083803eb107282d0b4afd377e9a
 #dh x448
+#dh x25519
+dh ef1233764fabef4f216f957871e7e9eda5a82d31aa1036ec54dd1d7f1dc6d15918370ebea703adbecf8ef48ca4760b555504b58eeadfe7ccfea8966096701434480dae0477537b1e8c56771b26742688a3804314ddbcd9121d21d1cdeb0574ab4f487a68b287e760305a8557d4b81aac36505ef206715e01ba581b4fed24f1806dc81051cedcbf78547574ef699f24b2aa02b0ae6d8dab4091795ed6ee95bf3120c8a7c7e607f4611b58f83bc0acde50a5345ff570366a2a3994b5ec09f1bb95a900f4b28ffd1b75336be514aaff162c810c35d65924710780f0954168d45a78179dbe496cd26fbc038846cbf054d8ae69bda87698a836866bde3d2c2aa4d7a2fb9a6cc3330d06f1e83e859f585f1612dd389badad41370a8d955dfd98ff241b0227130656b959962fc29e9721f7112bde43b4d09eb29db1ffac0a37ee25dbe99e1c4ea9bc23210971d2f02d8bc000f3caa711a6bab24ceab5022af119361bcb59b0c070989c8fb1ef005cef2aa988dabe9a822c082c374e15a94d8a0acd4a03 5418fc17aa90e9f025db7015c68748c63b021df235eb3f8dfc7a28bbfa0a119da168be262b639df2c285238713ef31075379dd4342ce526520e6b6d7d073509d1ff893dfed769536483228b89c00ec3b66b355d0158167e0f3bf67f34fdcbb40ffdd87d3cea8bc0723560d276f378301d120cb6ff5124ed325f1f7a93516f7f23ec5ba41a090a3c720f4a49bc2345304fd4683144f2b6970ee14e19dd75b95ce2273811de39cad185981eb5247f5049ae268390e1f54008fd052d1b6c07b5d93636db66a08de861cc4463512170c258221eb599ae595116274a71983f6e1f127609ca2114b244786b1648c0b9a7b4eb43073034fd19efce1f755b2e572d682176083eabfeba0bb5605de0c5c5ea01d6244284872a7f7e9a88105cde69c017590765ff24a62001b7674c39ee10260e440f56ab749fe352a3eb84b94981166e7a63bd294333668fcf9aa09ac7f133760a9d177d28bdfa4ee254dee39fa845a0230d6cf04384678970a88e20e829645e22fca339083803eb107282d0b4afd377e9a
 
 ###--------------------------------------------------------------------------
 location alice alice