aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--dir-spec.txt24
2 files changed, 21 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d40f0e1..6f56955 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,4 +49,4 @@ pages:
paths:
- public
only:
- - master
+ - main
diff --git a/dir-spec.txt b/dir-spec.txt
index 45b8466..162ae22 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -1331,6 +1331,8 @@ Table of Contents
is first added after the relay has been running for at least 24
hours.
+ (Introduced in tor-0.4.6.1-alpha)
+
"hidserv-rend-relayed-cells" SP NUM SP key=val SP key=val ... NL
[At most once.]
"hidserv-rend-v3-relayed-cells" SP NUM SP key=val SP key=val ... NL
@@ -1351,6 +1353,8 @@ Table of Contents
integer and included as 'NUM'. Note that the overall reported
value can be negative.
+ (Introduced in tor-0.4.6.1-alpha)
+
"hidserv-dir-onions-seen" SP NUM SP key=val SP key=val ... NL
[At most once.]
"hidserv-dir-v3-onions-seen" SP NUM SP key=val SP key=val ... NL
@@ -1366,6 +1370,8 @@ Table of Contents
of this line. Note that the overall reported value can be
negative.
+ (Introduced in tor-0.4.6.1-alpha)
+
"transport" transportname address:port [arglist] NL
[Any number.]
@@ -4181,10 +4187,20 @@ C. Converting a curve25519 public key to an ed25519 public key
[Recomputing the sign bit from the private key every time sounds
rather strange and inefficient to me… —isis]
- Alternatively, without access to the corresponding ed25519 private
- key, one may use the Montgomery u-coordinate to recover the
- Montgomery v-coordinate by computing the right-hand side of the
- Montgomery curve equation:
+ Note that in addition to its coordinates, an expanded Ed25519 private key
+ also has a 32-byte random value, "prefix", used to compute internal `r`
+ values in the signature. For security, this prefix value should be
+ derived deterministically from the curve25519 key. The Tor
+ implementation derives it as SHA512(private_key | STR)[0..32], where
+ STR is the nul-terminated string:
+
+ "Derive high part of ed25519 key from curve25519 key\0"
+
+
+ On the client side, where there is no access to the curve25519 private
+ keys, one may use the curve25519 public key's Montgomery u-coordinate to
+ recover the Montgomery v-coordinate by computing the right-hand side of
+ the Montgomery curve equation:
bv^2 = u(u^2 + au +1)