aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2023-11-15 22:02:06 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2023-11-15 22:02:06 +0000
commit8fe38cfc76e097b73c7700151bf670790eeaa105 (patch)
tree87de43e8073bd2caec32a8c247bbd9745fcb0092
parent712863b3a241554cf513193cce49074fb0698ae0 (diff)
downloadtorspec-8fe38cfc76e097b73c7700151bf670790eeaa105.tar.gz
torspec-8fe38cfc76e097b73c7700151bf670790eeaa105.zip
ssh-protocols: Say we use ssh conventions throughout
-rw-r--r--spec/ssh-protocols.md11
1 files changed, 8 insertions, 3 deletions
diff --git a/spec/ssh-protocols.md b/spec/ssh-protocols.md
index bef756d..f5802a8 100644
--- a/spec/ssh-protocols.md
+++ b/spec/ssh-protocols.md
@@ -34,6 +34,13 @@ its specification should be transferred to the Tor Specifications
## Interpretation
+This section uses
+the notation and conventions from `PROTOCOL.key` and
+SSH including [RFC4251 s5](https://datatracker.ietf.org/doc/html/rfc4251#section-5)),
+not those from the rest of the Tor Specifications.
+
+### Interpreting the table
+
For example, the row for `x25519@` indicates that:
* The Tor Project has assigned `x25519@spec.torproject.org`
@@ -108,9 +115,7 @@ and, the actual encoding used by OpenSSH doesn't seem to match
anything in that document.
So we document our understanding here.
-The contents of each `privatekey1`/`privatekey2`/`privatekeyN` is
-(in the notation and conventions from `PROTOCOL.key` and
-SSH including [RFC4251 s5](https://datatracker.ietf.org/doc/html/rfc4251#section-5)):
+The contents of each `privatekey1`/`privatekey2`/`privatekeyN` is:
```
string Public key algorithm (RFC4250 4.11.3)