summaryrefslogtreecommitdiff
path: root/src/config/dirservers
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2003-05-08 21:35:11 +0000
committerNick Mathewson <nickm@torproject.org>2003-05-08 21:35:11 +0000
commit22df330f144292f43de419d2f839af4f9f55ef04 (patch)
tree1c09c1b25997c29f05bd09a140c425ac7b94731e /src/config/dirservers
parent1d1f46e40dbcdc98022a568dc5aa5a73060eaedc (diff)
downloadtor-22df330f144292f43de419d2f839af4f9f55ef04.tar.gz
tor-22df330f144292f43de419d2f839af4f9f55ef04.zip
Get directories working.
Or at least, directories get generated, signed, download, and checked, with nobody seeming to crash. In config/*, added 'signing-key' blocks to dirservers and routers.or, so that everyone will know about the directories' signing keys. In or/directory.c, refrained from using a dirserver's signing key when no such key is known; added more debugging output. In or/main.c, added debugging output and fixed a few logic errors. In or/routers.c, added debugging output and prevented a segfault on routers_resolve_directory. The interleaving of arrays and lists on routerinfo_t is still messy, but at least it seems to work again. svn:r278
Diffstat (limited to 'src/config/dirservers')
-rw-r--r--src/config/dirservers20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/config/dirservers b/src/config/dirservers
index f8224cd6ed..6bb9a61dab 100644
--- a/src/config/dirservers
+++ b/src/config/dirservers
@@ -13,6 +13,13 @@ MIGJAoGBAMBBuk1sYxEg5jLAJy86U3GGJ7EGMSV7yoA6mmcsEVU3pwTUrpbpCmwS
7BvovoY3z4zk63NZVBErgKQUDkn3pp8n83xZgEf4GI27gdWIIwaBjEimuJlEY+7K
nZ7kVMRoiXCbjL6VAtNa4Zy1Af/GOm0iCIDpholeujQ95xew7rQnAgMA//8=
-----END RSA PUBLIC KEY-----
+signing-key
+-----BEGIN RSA PUBLIC KEY-----
+MIGJAoGBAMBBuk1sYxEg5jLAJy86U3GGJ7EGMSV7yoA6mmcsEVU3pwTUrpbpCmwS
+7BvovoY3z4zk63NZVBErgKQUDkn3pp8n83xZgEf4GI27gdWIIwaBjEimuJlEY+7K
+nZ7kVMRoiXCbjL6VAtNa4Zy1Af/GOm0iCIDpholeujQ95xew7rQnAgMA//8=
+-----END RSA PUBLIC KEY-----
+
# Router 2
router moria.mit.edu 9002 9012 9022 9032 1000000
@@ -21,6 +28,12 @@ MIGJAoGBANX/HHRuudz274MFSQ4manX8DhtsIuogNUyco9/0dr+XsfioTGd3RgMj
aSWlD87arkZO4hHBPHe0q89Z3s1UtUsyQ/VmsxSv9g2OCnF/dU2Nz4h6+Al3iNJF
1UlWR4eiqBx3djxdIl/t+Nidw++YGc8QqRqkg0EhQCJ2fnOtHn9bAgMA//8=
-----END RSA PUBLIC KEY-----
+signing-key
+-----BEGIN RSA PUBLIC KEY-----
+MIGJAoGBANX/HHRuudz274MFSQ4manX8DhtsIuogNUyco9/0dr+XsfioTGd3RgMj
+aSWlD87arkZO4hHBPHe0q89Z3s1UtUsyQ/VmsxSv9g2OCnF/dU2Nz4h6+Al3iNJF
+1UlWR4eiqBx3djxdIl/t+Nidw++YGc8QqRqkg0EhQCJ2fnOtHn9bAgMA//8=
+-----END RSA PUBLIC KEY-----
# Router 3
router moria.mit.edu 9003 9013 9023 9033 1000000
@@ -29,4 +42,9 @@ MIGJAoGBAJfkNWCaNkYIRwfHT06KBU6dz8W1xDpW5ezGJwAOoxCX3/ZNoUicb/1V
oB3OzW6VxWIiht3da/3K0ywiBOOCcf6BabKoMdiPpH7NIeu6XRmBYK2uqW13gBgh
xJbQBb58Nx8Fr05XkvLG6i+vTDY3MZOW3E2/DwSe/jFzuHSD5b3nAgMA//8=
-----END RSA PUBLIC KEY-----
-
+signing-key
+-----BEGIN RSA PUBLIC KEY-----
+MIGJAoGBAJfkNWCaNkYIRwfHT06KBU6dz8W1xDpW5ezGJwAOoxCX3/ZNoUicb/1V
+oB3OzW6VxWIiht3da/3K0ywiBOOCcf6BabKoMdiPpH7NIeu6XRmBYK2uqW13gBgh
+xJbQBb58Nx8Fr05XkvLG6i+vTDY3MZOW3E2/DwSe/jFzuHSD5b3nAgMA//8=
+-----END RSA PUBLIC KEY-----