[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[minion-cvs] Change Voting-Servers format; clarify sorting; add hyph...
Update of /home/minion/cvsroot/doc/spec
In directory moria.mit.edu:/tmp/cvs-serv11935
Modified Files:
dir-spec.txt
Log Message:
Change Voting-Servers format; clarify sorting; add hyphens to some names.
Index: dir-spec.txt
===================================================================
RCS file: /home/minion/cvsroot/doc/spec/dir-spec.txt,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- dir-spec.txt 18 Aug 2004 18:51:04 -0000 1.29
+++ dir-spec.txt 24 Aug 2004 22:18:40 -0000 1.30
@@ -293,7 +293,7 @@
'Descriptor-Version': the string '1.0'
'Nickname': A human-readable identifier for this server. It
- MUST NOT be more than 128 characters. It MUST contain only
+ MUST NOT be more than 24 characters. It MUST contain only
the characters [A-Za-z0-9] and '-'. It MUST NOT begin
with a '-' or a digit.
@@ -332,10 +332,7 @@
'Contact': An email address that can be used to contact the
administrator of this server. MUST NOT be more than 256
- characters. [This was a 'MAY' until Mixminion 0.0.7.]
-
- [XXX: it 'MUST be no more..' and it 'MAY be not more..'
- what's the difference? confused - PP]
+ characters.
The 'Server' section MAY contain the following entries, at most
once each:
@@ -372,15 +369,11 @@
'Version': The string '1.0'
- 'IP': An IPv4 address, in dotted-quad format. [Deprecated but
- necessary as of Mixminion 0.0.6; will be removed in favor of
- 'Hostname' in Mixminion 0.0.7.]
+ 'IP': An IPv4 address, in dotted-quad format. [No longer checked by
+ Mixminion 0.0.8; will no longer be generated by Mixminion 0.0.9.]
'Hostname': A fully qualified hostname, or an IPv4 address in
- dotted-quad format. [New in Mixminion 0.0.6. As a temporary
- hack, clients SHOULD assume that servers with hostnames can send
- *FWD/HOST messages, and that servers with IPs can send
- *FWD/IPv4 messages.]
+ dotted-quad format.
'Port': A TCP port at which IP accepts incoming MMTP connections.
@@ -478,14 +471,14 @@
Each 'Signed-Directory' section MUST contain the following entries:
- - 'DirectoryIdentity' : The Identity key of the directory server
+ - 'Directory-Identity' : The Identity key of the directory server
that generated this directory. The modulus of this key MUST be
between 2048 and 4096 bits long, and the exponent MUST be 65537.
- - 'DirectoryDigest' : The digest of the entire directory, starting
+ - 'Directory-Digest' : The digest of the entire directory, starting
with the Directory-Info section.
- - 'DirectorySignature' : The signature of the directory digest
+ - 'Directory-Signature' : The signature of the directory digest
with the directory server's identity key.
(A Signed-Directory section is unsigned; see 2.5)
@@ -504,42 +497,46 @@
midnight GMT on this date. This date SHOULD be exactly one day
after the date in 'Valid-After'.
- - 'Recommended-Servers' : A sorted, comma-separated list of server
- nicknames. Clients SHOULD NOT depend on servers whose nicknames are
- not on this list to be reliable or trustworthy.
+ - 'Recommended-Servers' : A sorted list of server nicknames. Items are
+ separated by a comma and a single space. Clients SHOULD NOT depend on
+ servers whose nicknames are not on this list to be reliable or
+ trustworthy.
- - 'Voting-Servers' : A comma-separated list of items for the
- the directory servers who voted on this directory. Each item contains
- a fingerprint, a single space, and a URL base. Each fingerprint is a
- base-64 encoded SHA1 hash of the ASN.1 encoding of the directory
- server's identity key; each URL base MUST be escaped. (See 5.1 below
- for more information on URL bases.) The items are sorted by
- fingerprint.
+ The 'Directory-Info' section MUST contain at least one of the following
+ item for each server who voted on this directory:
+
+ - 'Voting-Server' : Each item contains a fingerprint, a single space,
+ and a URL base. Each fingerprint is a base-64 encoded SHA1 hash of
+ the ASN.1 encoding of the directory server's identity key; each URL
+ base MUST be escaped. (See 5.1 below for more information on URL
+ bases.) The items are sorted by fingerprint.
The 'Recommended-Software' section MUST contain the following
entries, in order:
- - 'MixminionClient' : A comma-separated list of up-to-date versions of
- Mixminion, in ascending order by version. If a client is running a
- version more recent than any on the list, it SHOULD issue a warning.
- If a client is running a version not on the list, and some version on
- the list is more recent than the client's version, the client SHOULD
- issue a warning, and MAY refuse to run.
+ - 'MixminionClient' : A list of up-to-date versions of Mixminion, in
+ ascending order by version. Items are separated by a comma and a
+ single space. If a client is running a version more recent than any
+ on the list, it SHOULD issue a warning. If a client is running a
+ version not on the list, and some version on the list is more recent
+ than the client's version, the client SHOULD issue a warning, and MAY
+ refuse to run.
- - 'MixminionServer' : A comma-separated list of up-to-date versions of
- Mixminion, in ascending order by version. Servers should interpret
- this list as clients interpret 'MixminionClient'.
+ - 'MixminionServer' : A list of up-to-date versions of Mixminion, in
+ ascending order by version. Items are separated by a comma and a
+ single space. Servers should interpret this list as clients interpret
+ 'MixminionClient'.
- Entries in 'MixminionClient' and 'MixminionServer' are in decreasing order
- of preference. Because the version numbering scheme will be different for
- each implementation, lines within 'Recommended-Software' are version
+ Entries in 'MixminionClient' and 'MixminionServer' are in ascending order
+ by version. Because the version numbering scheme will be different for
+ each implementation, lines within 'Recommended-Software' are implementation-
specific. Other implementations of Type-III should generate similar
entries in 'Recommended-Software'.
- The server descriptors in the directory MUST be sorted by nickname, then
- by Valid-After date, then by digest. Each directory MUST include only a
- single nickname per identity key, and only a single identity key per
- nickname.
+ The server descriptors in the directory MUST be sorted by nickname
+ (case-insensitive), then by Valid-After date, then by digest. Each
+ directory MUST include only a single nickname per identity key, and only a
+ single identity key per nickname.
4.1.1. Migration note
@@ -823,7 +820,7 @@
- Do not include the descriptor if it is superseded by
other descriptors for this identity.
- Do not include the descriptor if it becomes valid more
- than 30 days in the future.
+ than 30 days in the future. XXXX
- Otherwise, include the descriptor.
- Include entries in Recommended-Software and Recommended-Servers