aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrevnoise <noise@trevp.net>2017-09-23 01:30:56 +0000
committertrevnoise <noise@trevp.net>2017-09-23 01:30:56 +0000
commite8860701a2192091cb1d34b8c3de6803a5b3970a (patch)
tree4c66ab66d3a99f0ab57f6e2524d0e77c529dc3c1
parentAdd security consideration on Authentication (diff)
downloadnoise-e8860701a2192091cb1d34b8c3de6803a5b3970a.tar.xz
noise-e8860701a2192091cb1d34b8c3de6803a5b3970a.zip
Fix references
-rw-r--r--noise.md6
-rw-r--r--output/noise.html6
-rw-r--r--output/noise.pdfbin369625 -> 369656 bytes
3 files changed, 6 insertions, 6 deletions
diff --git a/noise.md b/noise.md
index 1bfb533..bdb9898 100644
--- a/noise.md
+++ b/noise.md
@@ -398,7 +398,7 @@ variables:
A `SymmetricState` responds to the following functions:
* **`InitializeSymmetric(protocol_name)`**: Takes an arbitrary-length
- `protocol_name` byte sequence (see [Section 8](#protocol-names)). Executes the following steps:
+ `protocol_name` byte sequence (see [Section 8](#protocol-names-and-modifiers)). Executes the following steps:
* If `protocol_name` is less than or equal to `HASHLEN` bytes in length,
sets `h` equal to `protocol_name` with zero bytes appended to make
@@ -485,7 +485,7 @@ A `HandshakeState` responds to the following functions:
* Derives a `protocol_name` byte sequence by combining the names for the
handshake pattern and crypto functions, as specified in [Section
- 8](#protocol-names). Calls `InitializeSymmetric(protocol_name)`.
+ 8](#protocol-names-and-modifiers). Calls `InitializeSymmetric(protocol_name)`.
* Calls `MixHash(prologue)`.
@@ -1195,7 +1195,7 @@ using a self-chosen ephemeral public key.
------------
To indicate PSK mode and the placement of the `"psk"` token, pattern modifiers
-are used (see [Section 8](#protocol-names)). The modifier `psk0` places a `"psk"`
+are used (see [Section 8](#protocol-names-and-modifiers)). The modifier `psk0` places a `"psk"`
token at the beginning of the first handshake message. The modifiers
`psk1`, `psk2`, etc., place a `"psk"` token at the end of the
first, second, etc., handshake message.
diff --git a/output/noise.html b/output/noise.html
index 814068d..e4b515a 100644
--- a/output/noise.html
+++ b/output/noise.html
@@ -231,7 +231,7 @@
</ul>
<p>A <code>SymmetricState</code> responds to the following functions:</p>
<ul>
-<li><p><strong><code>InitializeSymmetric(protocol_name)</code></strong>: Takes an arbitrary-length <code>protocol_name</code> byte sequence (see <a href="#protocol-names">Section 8</a>). Executes the following steps:</p>
+<li><p><strong><code>InitializeSymmetric(protocol_name)</code></strong>: Takes an arbitrary-length <code>protocol_name</code> byte sequence (see <a href="#protocol-names-and-modifiers">Section 8</a>). Executes the following steps:</p>
<ul>
<li><p>If <code>protocol_name</code> is less than or equal to <code>HASHLEN</code> bytes in length, sets <code>h</code> equal to <code>protocol_name</code> with zero bytes appended to make <code>HASHLEN</code> bytes. Otherwise sets <code>h = HASH(protocol_name)</code>.</p></li>
<li><p>Sets <code>ck = h</code>.</p></li>
@@ -282,7 +282,7 @@
<p>Takes a set of DH key pairs <code>(s, e)</code> and public keys <code>(rs, re)</code> for initializing local variables, any of which may be empty. Public keys are only passed in if the <code>handshake_pattern</code> uses pre-messages (see <a href="#handshake-patterns">Section 7</a>). The ephemeral values <code>(e, re)</code> are typically left empty, since they are created and exchanged during the handshake; but there are exceptions (see <a href="#fallback-patterns">Section 10.1</a>).</p>
<p>Performs the following steps:</p>
<ul>
-<li><p>Derives a <code>protocol_name</code> byte sequence by combining the names for the handshake pattern and crypto functions, as specified in <a href="#protocol-names">Section 8</a>. Calls <code>InitializeSymmetric(protocol_name)</code>.</p></li>
+<li><p>Derives a <code>protocol_name</code> byte sequence by combining the names for the handshake pattern and crypto functions, as specified in <a href="#protocol-names-and-modifiers">Section 8</a>. Calls <code>InitializeSymmetric(protocol_name)</code>.</p></li>
<li><p>Calls <code>MixHash(prologue)</code>.</p></li>
<li><p>Sets the <code>initiator</code>, <code>s</code>, <code>e</code>, <code>rs</code>, and <code>re</code> variables to the corresponding arguments.</p></li>
<li><p>Calls <code>MixHash()</code> once for each public key listed in the pre-messages from <code>handshake_pattern</code>, with the specified public key as input (see <a href="#handshake-patterns">Section 7</a> for an explanation of pre-messages). If both initiator and responder have pre-messages, the initiator's public keys are hashed first.</p></li>
@@ -737,7 +737,7 @@
</ul>
<p>This rule guarantees that a <code>k</code> derived from a PSK will never be used for encryption unless it has also been randomized by <code>MixKey(e.public_key)</code> using a self-chosen ephemeral public key.</p>
<h2 id="pattern-modifiers">9.4. Pattern modifiers</h2>
-<p>To indicate PSK mode and the placement of the <code>&quot;psk&quot;</code> token, pattern modifiers are used (see <a href="#protocol-names">Section 8</a>). The modifier <code>psk0</code> places a <code>&quot;psk&quot;</code> token at the beginning of the first handshake message. The modifiers <code>psk1</code>, <code>psk2</code>, etc., place a <code>&quot;psk&quot;</code> token at the end of the first, second, etc., handshake message.</p>
+<p>To indicate PSK mode and the placement of the <code>&quot;psk&quot;</code> token, pattern modifiers are used (see <a href="#protocol-names-and-modifiers">Section 8</a>). The modifier <code>psk0</code> places a <code>&quot;psk&quot;</code> token at the beginning of the first handshake message. The modifiers <code>psk1</code>, <code>psk2</code>, etc., place a <code>&quot;psk&quot;</code> token at the end of the first, second, etc., handshake message.</p>
<p>Any pattern using one of these modifiers must process tokens according to the rules in <a href="#handshake-tokens%5D">Section 9.2</a>, and must follow the validity rule in <a href="#validity-rule">Section 9.3</a>.</p>
<p>The table below lists some unmodified one-way patterns on the left, and the recommended PSK pattern on the right:</p>
<table>
diff --git a/output/noise.pdf b/output/noise.pdf
index 3d11c28..5a90ba1 100644
--- a/output/noise.pdf
+++ b/output/noise.pdf
Binary files differ