aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrevp <github@trevp.net>2015-10-01 16:15:10 -0700
committertrevp <github@trevp.net>2015-10-01 16:15:10 -0700
commit252324405a5708f2dcff7d2e1b669f99ac4ec7e6 (patch)
tree0517d2d2d99396d12988f89cd05e948dcaa16f5c
parenttext tweaks. (diff)
downloadnoise-n0.tar.xz
noise-n0.zip
If k hasn't been used as encryption key, MixKey = HMAC(k, ...).n0
-rw-r--r--noise.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/noise.md b/noise.md
index bab1aac..567ebd2 100644
--- a/noise.md
+++ b/noise.md
@@ -172,9 +172,9 @@ indicates concatentation of byte sequences.
with zero bytes appended to make 32 bytes. Otherwise sets `h =
HASH(handshake_name)`. Sets `k = h`.
- * **`MixKey(data)`**: Sets `k = HMAC-HASH(GETKEY(k, n), data)`. Sets `n =
- 0`. Sets `has_key = True`. This will be called to mix DH outputs into the
- key.
+ * **`MixKey(data)`**: If `n == 0` sets `k = HMAC-HASH(k, data)`. Otherwise
+ sets `k = HMAC-HASH(GETKEY(k, n), data)`. Sets `n = 0`. Sets `has_key =
+ True`. This will be called to mix DH outputs into the key.
* **`MixHash(data)`**: Sets `h = HASH(h || data)`. This will be called to
mix public keys and handshake payloads into the hash.