[or-cvs] [tor/master] Revise 162's idea of how detached signatures work with flavors

[Nick Mathewson]

Author: Nick Mathewson <nickm at torproject.org>
Date: Tue, 15 Sep 2009 13:29:48 -0400
Subject: Revise 162's idea of how detached signatures work with flavors
Commit: 80a7a34755e7b7163778c5475f9a6459febb1bf4

The original proposal was vague and would have made older Tors reject
detached-signature documents as soon as they saw one with flavors.
---
 doc/spec/proposals/162-consensus-flavors.txt |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/doc/spec/proposals/162-consensus-flavors.txt b/doc/spec/proposals/162-consensus-flavors.txt
index 8fdf9d0..56a0b0e 100644
--- a/doc/spec/proposals/162-consensus-flavors.txt
+++ b/doc/spec/proposals/162-consensus-flavors.txt
@@ -91,9 +91,18 @@ Spec modifications:
 
    3. Document format: detached signatures.
 
-   In addition to the current detached signature format, we allow
-   the first line to take the form,
-      "consensus-digest" SP flavor SP 1*(Algname "=" Digest) NL
+   We amend the detached signature format to include more than one
+   consensus-digest line, and more than one set of signatures.
+
+   After the consensus-digest line, we allow more lines of the form:
+      "additional-digest" SP flavor SP algname SP digest NL
+
+   Before the directory-signature lines, we allow more entries of the form:
+      "additional-signature" SP flavor SP algname SP identity SP
+           signing-key-digest NL signature.
+
+   [We do not use "consensus-digest" or "directory-signature" for flavored
+   consensuses, since this could confuse older Tors.]
 
    The consensus-signatures URL should contain the signatures
    for _all_ flavors of consensus.
-- 
1.5.6.5