commit 487dd9d0d2ee08d8797370544e49f44dbca51d66 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 17 16:10:26 2013 -0500
Replace base-{16,32,64} with base{16,32,64} in specs
I'm not changing the proposals or attic'd specs, since those are more or less frozen.
Fixes 6875 in tor-spec
Patch from onizuka generated with
find ./ -type f -perm -u+rw -exec sed -ri 's/(Base)-(16|32|64)/\1\2/gi' {} ; --- dir-spec-v2.txt | 4 ++-- dir-spec.txt | 6 +++--- rend-spec.txt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dir-spec-v2.txt b/dir-spec-v2.txt index a2dacd3..021532e 100644 --- a/dir-spec-v2.txt +++ b/dir-spec-v2.txt @@ -102,7 +102,7 @@ KeywordChar ::= 'A' ... 'Z' | 'a' ... 'z' | '0' ... '9' | '-' ArgumentChar ::= any printing ASCII character except NL. WS = (SP | TAB)+ - Object ::= BeginLine Base-64-encoded-data EndLine + Object ::= BeginLine Base64-encoded-data EndLine BeginLine ::= "-----BEGIN " Keyword "-----" NL EndLine ::= "-----END " Keyword "-----" NL
@@ -552,7 +552,7 @@
4.4. HTTP URLs
- "Fingerprints" in these URLs are base-16-encoded SHA1 hashes. + "Fingerprints" in these URLs are base16-encoded SHA1 hashes.
The authoritative network-status published by a host should be available at: http://<hostname>/tor/status/authority.z diff --git a/dir-spec.txt b/dir-spec.txt index 531be5e..09a5967 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -223,7 +223,7 @@ KeywordChar ::= 'A' ... 'Z' | 'a' ... 'z' | '0' ... '9' | '-' ArgumentChar ::= any printing ASCII character except NL. WS = (SP | TAB)+ - Object ::= BeginLine Base-64-encoded-data EndLine + Object ::= BeginLine Base64-encoded-data EndLine BeginLine ::= "-----BEGIN " Keyword "-----" NL EndLine ::= "-----END " Keyword "-----" NL
@@ -2363,7 +2363,7 @@ at: http://<hostname>/tor/micro/d/<D1>-<D2>-<D3>[.z]
- <Dn> are base-64 encoded with trailing =s omitted for size and for + <Dn> are base64 encoded with trailing =s omitted for size and for consistency with the microdescriptor consensus format. -s are used instead of +s to separate items, since the + character is used in base64 encoding. @@ -2398,7 +2398,7 @@
4.7. General-use HTTP URLs
- "Fingerprints" in these URLs are base-16-encoded SHA1 hashes. + "Fingerprints" in these URLs are base16-encoded SHA1 hashes.
The most recent v3 consensus should be available at: http://<hostname>/tor/status-vote/current/consensus.z diff --git a/rend-spec.txt b/rend-spec.txt index dfadc7d..6c90c70 100644 --- a/rend-spec.txt +++ b/rend-spec.txt @@ -345,7 +345,7 @@
[At start, exactly once]
- The identifier of this introduction point: the base-32 encoded + The identifier of this introduction point: the base32 encoded hash of this introduction point's identity key.
"ip-address" SP ip-address NL @@ -526,7 +526,7 @@ 1.5. Alice receives a z.onion address.
When Alice receives a pointer to a location-hidden service, it is as a - hostname of the form "z.onion", where z is a base-32 encoding of a + hostname of the form "z.onion", where z is a base32 encoding of a 10-octet hash of Bob's service's public key, computed as follows:
1. Let H = H(PK).