[tor-bugs] #10598 [Obfsproxy]: Merge ScrambleSuit v2014.01.a.

[Tor Bug Tracker & Wiki]

#10598: Merge ScrambleSuit v2014.01.a.
-----------------------------+-----------------------------------------
     Reporter:  phw          |      Owner:  asn
         Type:  enhancement  |     Status:  new
     Priority:  normal       |  Milestone:
    Component:  Obfsproxy    |    Version:
   Resolution:               |   Keywords:  pt, obfsproxy, scramblesuit
Actual Points:               |  Parent ID:
       Points:               |
-----------------------------+-----------------------------------------

Comment (by asn):

 Replying to [comment:16 phw]:
 > Replying to [comment:13 asn]:
 >
 > > Please see branch `scramblesuit_init` for some simplifications of the
 `__init__()` function.
 >
 > Commit `4ecfb762`:
 >
 >  * Nitpick: `assert` is a statement and not a function, i.e., you don't
 need braces.
 >  * In fact, I wouldn't even use `assert` in that case.  When Python is
 invoked with `-O`, asserts are ignored.  I would turn the `else` branches
 into an `elif` and append an `else` branch which throws an exception.  (I
 found [https://mail.python.org/pipermail/python-
 list/2013-November/660401.html this link] to have a good explanation on
 when to use asserts).
 >  * I don't really like that we are using "client", "server" etc. as
 arguments.  How about using symbolic constants instead?  Since we are
 already using Twisted, this might be interesting:
 https://twistedmatrix.com/documents/12.3.0/core/howto/constants.html
 >  * The if-branch in server.py seems unnecessary as both, "server" and
 "ext_server" lead to `weAreClient` being set to `False`.
 >
 > Commit `ff86f6a2`, `f15be57b`, `d921f485`, and `ae86d3d4`:
 >  * The changes look good to me.  Could you please turn this into a
 separate branch forked from the ScrambleSuit repository?  I would prefer
 to merge changes from the ScrambleSuit repository into the obfsproxy
 repository and not the other way around.

 Makes sense. You can find my scramblesuit-only branch at
 `https://git.gitorious.org/scramblesuit/scramblesuit.git` with branch name
 `scramblesuit_init`.

 I also isolated the obfsproxy-only changes to branch
 `init_transport_config` in my personal obfsproxy repo.

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/10598#comment:17>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online