[tor-commits] [obfsproxy/master] Fix a mistake in the obfs2 spec.

[asn at torproject.org]

commit 2bf9d096bb45a4e6c69f1cbdc3d2565f54a44efc
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri Jan 23 02:20:36 2015 +0000

    Fix a mistake in the obfs2 spec.
---
 ChangeLog                         |    5 +++++
 doc/obfs2/obfs2-protocol-spec.txt |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a919976..f94c5a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes in version 0.2.14 - UNRELEASED:
+ - Correct a mistake in the obfs2 spec. Found by David Fifield.
+   Fixes bug #14329.
+
+
 Changes in version 0.2.13 - 2014-12-31:
  - Correctly handle the ScrambleSuit password being missing entirely
    when running in managed mode. Patch by Yawning Angel. Fixes #13587.
diff --git a/doc/obfs2/obfs2-protocol-spec.txt b/doc/obfs2/obfs2-protocol-spec.txt
index c0b0578..f6dc3de 100644
--- a/doc/obfs2/obfs2-protocol-spec.txt
+++ b/doc/obfs2/obfs2-protocol-spec.txt
@@ -57,7 +57,7 @@
    And the responder generates:
 
     RESP_SEED = SR(SEED_LENGTH)
-    RESP_PAD_KEY = MAC("Responder obfuscation padding", INIT_SEED)[:KEYLEN]
+    RESP_PAD_KEY = MAC("Responder obfuscation padding", RESP_SEED)[:KEYLEN]
 
    Each then generates a random number PADLEN in range from 0 through
    MAX_PADDING (inclusive).