[or-cvs] Refactor buffers; implement descriptors.

[nickm@seul.org (Nick Mathewson)]

Update of /home/or/cvsroot/doc
In directory moria.mit.edu:/tmp/cvs-serv24061/doc

Modified Files:
	TODO tor-spec.txt 
Log Message:
Refactor buffers; implement descriptors.

'buf_t' is now an opaque type defined in buffers.c .

Router descriptors now include all keys; routers generate keys as 
needed on startup (in a newly defined "data directory"), and generate
their own descriptors.  Descriptors are now self-signed.

Implementation is not complete: descriptors are never published; and
upon receiving a descriptor, the directory doesn't do anything with
it.

At least "routers.or" and orkeygen are now obsolete, BTW.



Index: TODO
===================================================================
RCS file: /home/or/cvsroot/doc/TODO,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- TODO	24 Sep 2003 21:30:12 -0000	1.18
+++ TODO	25 Sep 2003 05:17:09 -0000	1.19
@@ -48,7 +48,7 @@
         . integrate rep_ok functions, see what breaks
 ARMA    - configure log files. separate log file, separate severities.
 ARMA    - what assumptions break if we fclose(0) when we daemonize?
-NICK    - make buffer struct elements opaque outside buffers.c
+NICK    o make buffer struct elements opaque outside buffers.c
 ARMA    - Go through log messages, reduce confusing error messages.
 ARMA    - make the logs include more info (fd, etc)
 ARMA    - add log convention to the HACKING file

Index: tor-spec.txt
===================================================================
RCS file: /home/or/cvsroot/doc/tor-spec.txt,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- tor-spec.txt	20 Sep 2003 06:56:15 -0000	1.30
+++ tor-spec.txt	25 Sep 2003 05:17:09 -0000	1.31
@@ -439,12 +439,16 @@
 
 (Unless otherwise noted, tokens on the same line are space-separated.)
 
-Router ::= Router-Line  Public-Key  Signing-Key?  Exit-Policy NL
+Router ::= Router-Line  Onion-Key Link-Key Signing-Key  Exit-Policy Router-Signature NL
 Router-Line ::= "router" address ORPort APPort DirPort bandwidth NL
-Public-key ::= a public key in PEM format   NL
-Signing-Key ::= "signing-key"  NL  signing key in PEM format   NL
+Onion-key ::= "onion-key"  NL  a public key in PEM format   NL
+Link-key ::= "link-key"  NL  a public key in PEM format  NL
+Signing-Key ::= "signing-key"  NL  a public key in PEM format   NL
 Exit-Policy ::= Exit-Line*
 Exit-Line ::= ("accept"|"reject")  string  NL
+Router-Signature ::= "router-signature"  NL  Signature
+Signature ::= "-----BEGIN SIGNATURE-----" NL
+              Base-64-encoded-signature NL "-----END SIGNATURE-----" NL
 
 ORport ::= port where the router listens for routers/proxies (speaking cells)
 APPort ::=  where the router listens for applications (speaking socks)
@@ -475,7 +479,8 @@
 Directory-Header ::= "signed-directory" NL Software-Line NL
 Software-Line: "recommended-software"  comma-separated-version-list
 Directory-Router ::= Router
-Signature ::= "directory-signature" NL "-----BEGIN SIGNATURE-----" NL
+Directory-Signature ::= "directory-signature"  NL  Signature
+Signature ::= "-----BEGIN SIGNATURE-----" NL
               Base-64-encoded-signature NL "-----END SIGNATURE-----" NL
 
 Note:  The router block for the directory server must appear first.