diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-06-04 22:29:00 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-06-04 22:29:00 +0000 |
| commit | 8b0e6a446697ad3d15a1fe23a8c5c3ed53a60c70 (patch) | |
| tree | d2dcdf0c97e3db1bf4852bcb0b96102c6a120bae /doc | |
| parent | 8d1224eb51bf0f9fd0c829aa7fb22e359513b71b (diff) | |
| download | tor-8b0e6a446697ad3d15a1fe23a8c5c3ed53a60c70.tar tor-8b0e6a446697ad3d15a1fe23a8c5c3ed53a60c70.tar.gz | |
r13250@catbus: nickm | 2007-06-04 18:28:55 -0400
Adapt code to parse v3 networkstatus votes so it can also parse a consensus. Make networkstatus_vote_t the catch-all type for votes and conensuses. Correct/clarify the second argument to directory-signature.
svn:r10491
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/TODO | 4 | ||||
| -rw-r--r-- | doc/spec/dir-spec.txt | 30 |
2 files changed, 13 insertions, 21 deletions
@@ -66,7 +66,7 @@ Things we'd like to do in 0.2.0.x: - Get authorities voting . Implement parsing for new document formats o Parse key certificates - - Parse votes and consensuses + o Parse votes and consensuses - Unit tests for above . Code to manage key certificates o Generate certificates @@ -77,7 +77,7 @@ Things we'd like to do in 0.2.0.x: o Avoid double-checking signatures every time we get a vote. - Warn about expired stuff. o Code to generate votes - - Code to generate consensus from a list of votes + o Code to generate consensus from a list of votes - Add a signature to a consensus. - Code to check signatures on a consensus - Push/pull documents as appropriate. diff --git a/doc/spec/dir-spec.txt b/doc/spec/dir-spec.txt index a34496a5e..31f8348e5 100644 --- a/doc/spec/dir-spec.txt +++ b/doc/spec/dir-spec.txt @@ -759,10 +759,10 @@ $Id$ [Exactly once, at start] Describes this authority. The nickname is a convenient identifier - for the authority. The identity is an uppercase hex fingerprint of the - authority's current identity key. The address is the server's - hostname. The IP is the server's current IP address, and dirport - is its current directory port. + for the authority. The identity is an uppercase hex fingerprint of + the authority's current (v3 authority) identity key. The address is + the server's hostname. The IP is the server's current IP address, + and dirport is its current directory port. XXXXorport "contact" SP string NL @@ -788,13 +788,6 @@ $Id$ As in the authority section of a vote. - "fingerprint" SP fingerprint NL - - [Exactly once.] - - An upper-case hex fingerprint, without spaces, of the authority's - current identity key. - "vote-digest" SP digest NL [Exactly once.] @@ -861,17 +854,16 @@ $Id$ The signature section contains the following item, which appears Exactly Once for a vote, and At Least Once for a consensus. - "directory-signature" SP identity SP digest NL Signature + "directory-signature" SP identity SP signing-key-digest NL Signature This is a signature of the status document, with the initial item "network-status-version", and the signature item - "directory-signature", using the signing key. (In this case, we - take the hash through the _space_ after directory-signature, not - the newline: this ensures that all authorities sign the same - thing.) "identity" is the hex-encoded digest of the authority - identity key of the signing authority, and "digest" is the - hex-encoded digest of the current authority signing key of the - signing authority. + "directory-signature", using the signing key. (In this case, we take + the hash through the _space_ after directory-signature, not the + newline: this ensures that all authorities sign the same thing.) + "identity" is the hex-encoded digest of the authority identity key of + the signing authority, and "signing-key-digest" is the hex-encoded + digest of the current authority signing key of the signing authority. 3.3. Deciding how to vote. |