[tor-commits] [torspec/master] dir-spec, rend-spec-v3: typos and simplifications

[nickm at torproject.org]

commit ae8d5de13ba64238bc24b841e6269af72b86460a
Author: Filippo Valsorda <hi at filippo.io>
Date:   Fri Nov 17 15:22:17 2017 -0500

    dir-spec, rend-spec-v3: typos and simplifications
---
 dir-spec.txt     | 24 ++++++++++++------------
 rend-spec-v3.txt |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index 1c63b21..54e122f 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -285,11 +285,13 @@
      <signature item keyword> [arguments] NL SIGNATURE NL
 
    The "SIGNATURE" Object contains a signature (using the signing key) of
-   the PKCS1-padded digest of the entire document, taken from the
+   the PKCS#1 1.5 padded digest of the entire document, taken from the
    beginning of the Initial item, through the newline after the Signature
    Item's keyword and its arguments.
 
-   Unless otherwise, the digest algorithm is SHA-1.
+   The signature does not include the algorithmIdentifier specified in PKCS #1.
+
+   Unless specified otherwise, the digest algorithm is SHA-1.
 
    All documents are invalid unless signed with the correct signing key.
 
@@ -2102,7 +2104,7 @@
 
         See shared-rand-current-value decription above.
 
-   The authority section of a consensus contains groups the following items,
+   The authority section of a consensus contains groups of the following items,
    in the order given, with one group for each authority that contributed to
    the consensus, with groups sorted by authority identity digest:
 
@@ -2144,7 +2146,8 @@
         "Nickname" is the OR's nickname.  "Identity" is a hash of its
         identity key, encoded in base64, with trailing equals sign(s)
         removed.  "Digest" is a hash of its most recent descriptor as
-        signed (that is, not including the signature), encoded in base64.
+        signed (that is, not including the signature) by the RSA identity
+        key (see section 1.3.), encoded in base64.
 
         "Publication" is the publication time of its most recent descriptor,
         in the form YYYY-MM-DD HH:MM:SS, in UTC.  Implementations MAY base
@@ -3398,7 +3401,7 @@
    prefer fallbacks to authorities, trying them earlier and more frequently.
    In all other cases, the client downloads from caches randomly chosen from
    among those believed to be V3 directory servers.  (This information comes
-   from the network-status documents; see 6 below.)
+   from the network-status documents.)
 
    After receiving any response client MUST discard any network-status
    documents that it did not request.
@@ -3484,8 +3487,8 @@
    After choosing mirrors, the client divides the descriptors among them
    randomly.
 
-   After receiving any response client MUST discard any descriptors that it
-   did not request.
+   After receiving any response the client MUST discard any descriptors that
+   it did not request.
 
    When a descriptor download fails, the client notes it, and does not
    consider the descriptor downloadable again until a certain amount of time
@@ -3847,11 +3850,8 @@ D. Inferring missing proto lines.
      Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1-2 Link=1-4
      LinkAuth=1 Microdesc=1-2 Relay=1-2
 
-   For Desc, Tor versions before 0.2.7.stable should be taken to have Desc=1
-   and versions 0.2.7.stable or later should have Desc=1-2.
-
-   For Microdesc and Cons, Tor versions before 0.2.7.stable should be taken to
-   support version 1; 0.2.7.stable and later should have 1-2.
+   For Desc, Microdesc and Cons, Tor versions before 0.2.7.stable should be
+   taken to only support version 1.
 
 E. Limited ed diff format
 
diff --git a/rend-spec-v3.txt b/rend-spec-v3.txt
index e408e8b..ebe05d8 100644
--- a/rend-spec-v3.txt
+++ b/rend-spec-v3.txt
@@ -2232,7 +2232,7 @@ Appendix C. Recommendations for searching for vanity .onions [VANITY]
         While pk does not satisfy X:
 
             Add the number 8 to sk
-            Add the scalar 8*B to pk
+            Add the point 8*B to pk
 
         Return sk, pk.