aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrevp <github@trevp.net>2015-11-14 00:12:07 -0800
committertrevp <github@trevp.net>2015-11-14 00:12:07 -0800
commit114613373d7a58ebb3267a6ada080542142f5294 (patch)
tree1335f49e703652a48a9142bc2089f924c3c57d0e
parentPSK without explicit randoms, by MixKey(e.public_key) (diff)
downloadnoise-114613373d7a58ebb3267a6ada080542142f5294.tar.xz
noise-114613373d7a58ebb3267a6ada080542142f5294.zip
MixHash(e.public_key)
-rw-r--r--noise.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/noise.md b/noise.md
index 33b8005..772ad2b 100644
--- a/noise.md
+++ b/noise.md
@@ -286,8 +286,8 @@ A `HandshakeState` responds to the following methods:
message pattern:
* For "e": Sets `e = GENERATE_KEYPAIR()`, overwriting any previous value
- for `e`. Appends `e.public_key` to the buffer. If `psk` is true, calls
- `MixKey(e.public_key)`.
+ for `e`. Appends `e.public_key` to the buffer. Calls
+ `MixHash(e.public_key)`. If `psk` is true, calls `MixKey(e.public_key)`.
* For "s": Appends `EncryptAndHash(s.public_key)` to the buffer.
@@ -306,8 +306,8 @@ A `HandshakeState` responds to the following methods:
increments `message_index`, and sequentially processes each token from the
message pattern:
- * For "e": Sets `re` to the next `DHLEN` bytes from the buffer. If `psk`
- is true, calls `MixKey(e.public_key)`.
+ * For "e": Sets `re` to the next `DHLEN` bytes from the buffer. Calls
+ `MixHash(e.public_key)`. If `psk` is true, calls `MixKey(e.public_key)`.
* For "s": Sets `data` to the next `DHLEN + 16` bytes of the message if
`has_key == True`, or to the next `DHLEN` bytes otherwise. Sets `rs` to