June 2016 - tor-commits - lists.torproject.org

[torspec/master] Clarify what the identity key it is
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit cc7dd04f181cf79d8c4dcee79c5090990323511e Author: Ivan Markin <twim(a)riseup.net> Date: Thu Jun 23 13:16:14 2016 +0000 Clarify what the identity key it is --- dir-spec.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 08a4f8e..8a8b583 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -494,10 +494,12 @@ This element contains an RSA signature, generated using the onion-key, of the following: - A SHA1 hash of the identity key [20 bytes] - The Ed25519 identity key [32 bytes] + A SHA1 hash of the RSA identity key, + i.e. RSA key from "signing-key" (see below) [20 bytes] + The Ed25519 identity key, + i.e. Ed25519 key from "master-key-ed25519" [32 bytes] - If there is no ed25519 identity key, or if in some future version + If there is no Ed25519 identity key, or if in some future version there is no RSA identity key, the corresponding field must be zero-filled.

1 0

[torspec/master] Simplified router-sig-ed25519 descripton
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit e851890023012fccfd6e5d4af26e16e50f0d1120 Author: Ivan Markin <twim(a)riseup.net> Date: Thu Jun 23 20:06:18 2016 +0000 Simplified router-sig-ed25519 descripton --- dir-spec.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index e1bb9e3..5bce8c5 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -573,12 +573,10 @@ "router-sig-ed25519" SP Signature NL - [At most once] + [At most once, required when identity-ed25519 is present] - When an identity-ed25519 element is present, there must also - be a "router-sig-ed25519" element. It MUST be the - next-to-last element in the descriptor, appearing immediately - before the RSA signature. It MUST contain an ed25519 + It MUST be the next-to-last element in the descriptor, appearing + immediately before the RSA signature. It MUST contain an Ed25519 signature of a SHA256 digest of the entire document, from the first character up to and including the first space after the "router-sig-ed25519" string, prefixed with the string "Tor

1 0

[torspec/master] clarify router-sig-ed25519 even harder
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit ff0f04535728cabe4c57bcdef965b2bec1e403a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 17:01:03 2016 -0400 clarify router-sig-ed25519 even harder --- dir-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index 5bce8c5..08a4f8e 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -573,7 +573,8 @@ "router-sig-ed25519" SP Signature NL - [At most once, required when identity-ed25519 is present] + [At most once.] + [Required when identity-ed25519 is present; forbidden otherwise.] It MUST be the next-to-last element in the descriptor, appearing immediately before the RSA signature. It MUST contain an Ed25519

1 0

[torspec/master] Merge remote-tracking branch 'karsten/task-19283'
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 976cca3c452ce0e960c4d6dc93c0d345a8c22289 Merge: c59890c 8bc30d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 16:47:10 2016 -0400 Merge remote-tracking branch 'karsten/task-19283' dir-spec.txt | 8 ++++++++ 1 file changed, 8 insertions(+)

1 0

[torspec/master] Specify "tunnelled-dir-server" line.
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 8bc30d6d4312a88770f848111b7eff909c6a975b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jun 28 11:07:08 2016 +0200 Specify "tunnelled-dir-server" line. Partial implementation of prop 237, ticket 12538. See also 1ceb714 in tor.git. --- dir-spec.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dir-spec.txt b/dir-spec.txt index c1bb2d4..3938679 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -722,6 +722,14 @@ Tor MAY accept a limited number of addresses or ports. As of Tor 0.2.3.x only the first address and the first port are used. + "tunnelled-dir-server" NL + + [At most once.] + [No extra arguments] + + Present if the router accepts "tunneled" directory requests using a + BEGIN_DIR cell over the router's OR port. + 2.1.2. Extra-info document format Extra-info documents consist of the following items:

1 0

[torspec/master] Fixed typos (identity-25519 -> identity-ed25519)
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit c59890c1470797dd95b488aacac82c960b4b4097 Author: Ivan Markin <twim(a)riseup.net> Date: Fri Jun 24 13:12:31 2016 +0000 Fixed typos (identity-25519 -> identity-ed25519) --- dir-spec.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 7844011..9b0d164 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -487,7 +487,7 @@ "onion-key-crosscert" NL a RSA signature in PEM format. - [At most once, required when identity-25519 is present] + [At most once, required when identity-ed25519 is present] [No extra arguments] @@ -523,7 +523,7 @@ "-----BEGIN ED25519 CERT-----" NL certificate "-----END ED25519 CERT-----" NL - [At most once, required when identity-25519 is present] + [At most once, required when identity-ed25519 is present] [No extra arguments] A signature created with the ntor-onion-key, using the

1 0

[torspec/master] Fixed a typo in dir-spec.txt
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 2958d6e849378a68856930bd97ec51ee35f417ca Author: Ivan Markin <twim(a)riseup.net> Date: Thu Jun 23 20:12:21 2016 +0000 Fixed a typo in dir-spec.txt --- dir-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index 382f78c..7844011 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -584,7 +584,7 @@ "router-sig-ed25519" string, prefixed with the string "Tor router descriptor signature v1". Its format is: - The signature is encoded in Base64 with terminating =s remove. + The signature is encoded in Base64 with terminating =s removed. The signing key in the identity-ed25519 certificate MUST be the one used to sign the document.

1 0

[torspec/master] Fixed a typo in dir-spec
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 2949531762676c0a343aa0e67ec586ef72b090f6 Author: Ivan Markin <twim(a)riseup.net> Date: Thu Jun 23 20:54:18 2016 +0000 Fixed a typo in dir-spec --- dir-spec.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index c1bb2d4..382f78c 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -400,8 +400,8 @@ [No extra arguments] The certificate is a base64-encoded Ed25519 certificate (see - cert-spec.txt) terminating =s removed. When this element is - present, it MUST appear as the first or second element in + cert-spec.txt) with terminating =s removed. When this element + is present, it MUST appear as the first or second element in the router descriptor. The certificate has CERT_TYPE of [04]. It must include a

1 0

[tor/master] Document the --passphrase-fd option in the tor manpage
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 90f85b012a01a02c62863932394997e3f8b938a2 Author: Peter Palfrader <peter(a)palfrader.org> Date: Sat Jun 25 16:44:41 2016 +0200 Document the --passphrase-fd option in the tor manpage --- changes/bug19504 | 3 +++ doc/tor.1.txt | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug19504 b/changes/bug19504 new file mode 100644 index 0000000..1a7676a --- /dev/null +++ b/changes/bug19504 @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation): + - Document the --passphrase-fd option in the tor manpage. + Fixes bug 19504. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 74915b7..b2f5cfa 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -118,6 +118,11 @@ COMMAND-LINE OPTIONS directory of your Tor daemon, and make sure that they are owned by the user actually running the Tor daemon on your system. +**--passphrase-fd** __FILEDES__:: + Filedescriptor to read the passphrase from. Ends at the first NUL or + newline. Default: read from the terminal. + + Other options can be specified on the command-line in the format "--option value", in the format "option value", or in a configuration file. For instance, you can tell Tor to start listening for SOCKS connections on port

1 0

[tor/master] Actually, the tor --passphrase-fd is different from the tor-gencert one
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 869e5688b7856b0ceb8290a76a651a7f4306e926 Author: Peter Palfrader <peter(a)palfrader.org> Date: Sat Jun 25 16:53:07 2016 +0200 Actually, the tor --passphrase-fd is different from the tor-gencert one --- doc/tor.1.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index b2f5cfa..782c109 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -119,8 +119,10 @@ COMMAND-LINE OPTIONS user actually running the Tor daemon on your system. **--passphrase-fd** __FILEDES__:: - Filedescriptor to read the passphrase from. Ends at the first NUL or - newline. Default: read from the terminal. + Filedescriptor to read the passphrase from. Note that unlike with the + tor-gencert program, the entire file contents are read and used as + the passphrase, including any trailing newlines. + Default: read from the terminal. Other options can be specified on the command-line in the format "--option

1 0