Merge lp:~wiqd/kali/ssl-support into lp:kali

[Greg Armer]

[Tristan Seligmann (mithrandi)]

"from OpenSSL import SSL" seems to be pointless.

I'd suggest moving the "from twisted.internet import ssl" to the rest of the imports, using an idiom like

try:
    from twisted.internet import ssl
except ImportError:
    ssl = None

This will also require changing the name of the parameter, to avoid a name collision.

Finally, ServicesFactory can be instantiated outside of the conditional, avoiding a little code duplication.

review: Needs Fixing

[Jeremy Thurgood (jerith)]

SSL should be an optional config option. If it's missing, it should default to false. Also, what Tristan said about the imports.

review: Needs Fixing

[lp:~wiqd/kali/ssl-support]

118. By Greg Armer on 2009-01-12

Fixed review comments

[Tristan Seligmann (mithrandi)]

Instead of pulling "ssl" out of **params, it probably makes more sense to do "ssl=False" in the argument list.

Also, the code now always instantiates the TCPClient service, even if SSL is being used; this probably isn't so great, even though the service will never be hooked up.

review: Needs Fixing

[lp:~wiqd/kali/ssl-support]

119. By Greg Armer on 2009-01-12

Fixed review comments (hopefully)

[Tristan Seligmann (mithrandi)]

Okay, looks good to merge!

review: Approve