commit 9ef190a4d70cd44053dde4d19d5579a609ced091 Merge: 8ac51f3 ad09a51 Author: Nick Mathewson nickm@torproject.org Date: Sat May 28 21:34:22 2011 -0400

Merge remote-tracking branch 'asn/shared_secret'

Conflicts: doc/protocol-spec.txt

doc/protocol-spec.txt | 12 ++++-- src/main.c | 38 ++++++++++------- src/network.c | 43 +++++++++++-------- src/protocol.c | 6 +- src/protocol.h | 59 ++++++++++++++++++-------- src/protocols/dummy.c | 6 +- src/protocols/dummy.h | 3 +- src/protocols/obfs2.c | 94 +++++++++++++++++++++++++++++++---------- src/protocols/obfs2.h | 9 ++-- src/protocols/obfs2_crypt.c | 4 +- src/protocols/obfs2_crypt.h | 2 + src/test/unittest_obfs2.c | 97 +++++++++++++++++++++++++++++++++++++----- 12 files changed, 272 insertions(+), 101 deletions(-)

diff --cc doc/protocol-spec.txt index 471f2c0,798da14..c11f653 --- a/doc/protocol-spec.txt +++ b/doc/protocol-spec.txt @@@ -16,13 -16,15 +16,15 @@@ The Twobfuscato

1. Primitives, notation, and constants.

- H(x) is SHA256 of X + H(x) is SHA256 of x. + H^n(x) is H(x) called iteratively n times. + - E_K(s) is the AES-counter-mode encryption of s using the key K. + E_K(s) is the AES-CTR-128 encryption of s using K as key.

- x | y is the concatenation of x and y - UINT32(n) is the 4 byte value of n in big-endian (network) order - SR(n) is n bytes of strong random data - WR(n) is n bytes of weaker random data + x | y is the concatenation of x and y. + UINT32(n) is the 4 byte value of n in big-endian (network) order. + SR(n) is n bytes of strong random data. + WR(n) is n bytes of weaker random data. "xyz" is the ASCII characters 'x', 'y', and 'z', not NUL-terminated. s[:n] is the first n bytes of s. s[n:] is the last n bytes of s.