Commit 0005192c authored by George Kadianakis's avatar George Kadianakis
Browse files

Print ScrambleSuit disclaimer on startup. 

instead of printing it for every new connection
parent c977bab0

ChangeLog

+4 −0
Original line number Diff line number Diff line 
Changes in version 0.2.10 - UNRELEASED:

 - Only print ScrambleSuit disclaimer on startup (instead of

   printing it for every connection). Fixes #11768.



Changes in version 0.2.9 - 2014-05-01:

 - Support connecting over a HTTPS CONNECT proxy.  Patch by Yawning Angel.

   Fixes #11409.

obfsproxy/transports/scramblesuit/scramblesuit.py

+4 −4
Original line number Diff line number Diff line
@@ -45,10 +45,6 @@ class ScrambleSuitTransport( base.BaseTransport ): 
        Initialise a ScrambleSuitTransport object.

        """



        log.error("\n\n################################################\n"

                  "Do NOT rely on ScrambleSuit for strong security!\n"

                  "################################################\n")



        log.debug("Initialising %s." % const.TRANSPORT_NAME)



        super(ScrambleSuitTransport, self).__init__()
@@ -106,6 +102,10 @@ class ScrambleSuitTransport( base.BaseTransport ): 
        Called once when obfsproxy starts.

        """



        log.error("\n\n################################################\n"

                  "Do NOT rely on ScrambleSuit for strong security!\n"

                  "################################################\n")



        util.setStateLocation(transportConfig.getStateLocation())



        cls.weAreClient = transportConfig.weAreClient