From dccb1dbb3c3fba74933425414264af6af7fb60d6 Mon Sep 17 00:00:00 2001
From: lakshyacis <lakshya.p@cisinlabs.com>
Date: Wed, 11 Sep 2019 14:31:17 +0530
Subject: [PATCH] tls flake8 fixes

---
 src/network/tls.py | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/network/tls.py b/src/network/tls.py
index c643f46e..88c48e73 100644
--- a/src/network/tls.py
+++ b/src/network/tls.py
@@ -64,15 +64,18 @@ class TLSDispatcher(AdvancedDispatcher):
         self.tlsStarted = True
         # Once the connection has been established, it's safe to wrap the
         # socket.
-        if sys.version_info >= (2,7,9):
-            context = ssl.create_default_context(purpose = ssl.Purpose.SERVER_AUTH if self.server_side else ssl.Purpose.CLIENT_AUTH)
+        if sys.version_info >= (2, 7, 9):
+            context = ssl.create_default_context(
+                purpose=ssl.Purpose.SERVER_AUTH if self.server_side else ssl.Purpose.CLIENT_AUTH)
             context.set_ciphers(self.ciphers)
             context.set_ecdh_curve("secp256k1")
             context.check_hostname = False
             context.verify_mode = ssl.CERT_NONE
             # also exclude TLSv1 and TLSv1.1 in the future
-            context.options = ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3 | ssl.OP_SINGLE_ECDH_USE | ssl.OP_CIPHER_SERVER_PREFERENCE
-            self.sslSocket = context.wrap_socket(self.socket, server_side = self.server_side, do_handshake_on_connect=False)
+            context.options = ssl.OP_ALL | ssl.OP_NO_SSLv2 |\
+                ssl.OP_NO_SSLv3 | ssl.OP_SINGLE_ECDH_USE | ssl.OP_CIPHER_SERVER_PREFERENCE
+            self.sslSocket = context.wrap_socket(
+                self.socket, server_side=self.server_side, do_handshake_on_connect=False)
         else:
             self.sslSocket = ssl.wrap_socket(
                 self.socket, server_side=self.server_side,
@@ -101,7 +104,7 @@ class TLSDispatcher(AdvancedDispatcher):
         try:
             # during TLS handshake, and after flushing write buffer, return status of last handshake attempt
             if self.tlsStarted and not self.tlsDone and not self.write_buf:
-                #print "tls readable, %r" % (self.want_read)
+                # print "tls readable, %r" % (self.want_read)
                 return self.want_read
             # prior to TLS handshake, receiveDataThread should emulate synchronous behaviour
             elif not self.fullyEstablished and (self.expectBytes == 0 or not self.write_buf_empty()):
@@ -114,10 +117,10 @@ class TLSDispatcher(AdvancedDispatcher):
         try:
             # wait for write buffer flush
             if self.tlsStarted and not self.tlsDone and not self.write_buf:
-                #logger.debug("%s:%i TLS handshaking (read)", self.destination.host, self.destination.port)
+                # logger.debug("%s:%i TLS handshaking (read)", self.destination.host, self.destination.port)
                 self.tls_handshake()
             else:
-                #logger.debug("%s:%i Not TLS handshaking (read)", self.destination.host, self.destination.port)
+                # logger.debug("%s:%i Not TLS handshaking (read)", self.destination.host, self.destination.port)
                 return AdvancedDispatcher.handle_read(self)
         except AttributeError:
             return AdvancedDispatcher.handle_read(self)
@@ -135,10 +138,10 @@ class TLSDispatcher(AdvancedDispatcher):
         try:
             # wait for write buffer flush
             if self.tlsStarted and not self.tlsDone and not self.write_buf:
-                #logger.debug("%s:%i TLS handshaking (write)", self.destination.host, self.destination.port)
+                # logger.debug("%s:%i TLS handshaking (write)", self.destination.host, self.destination.port)
                 self.tls_handshake()
             else:
-                #logger.debug("%s:%i Not TLS handshaking (write)", self.destination.host, self.destination.port)
+                # logger.debug("%s:%i Not TLS handshaking (write)", self.destination.host, self.destination.port)
                 return AdvancedDispatcher.handle_write(self)
         except AttributeError:
             return AdvancedDispatcher.handle_write(self)
@@ -158,16 +161,16 @@ class TLSDispatcher(AdvancedDispatcher):
             return False
         # Perform the handshake.
         try:
-            #print "handshaking (internal)"
+            # print "handshaking (internal)"
             self.sslSocket.do_handshake()
         except ssl.SSLError as err:
-            #print "%s:%i: handshake fail" % (self.destination.host, self.destination.port)
+            # print "%s:%i: handshake fail" % (self.destination.host, self.destination.port)
             self.want_read = self.want_write = False
             if err.args[0] == ssl.SSL_ERROR_WANT_READ:
-                #print "want read"
+                # print "want read"
                 self.want_read = True
             if err.args[0] == ssl.SSL_ERROR_WANT_WRITE:
-                #print "want write"
+                # print "want write"
                 self.want_write = True
             if not (self.want_write or self.want_read):
                 raise
@@ -180,7 +183,7 @@ class TLSDispatcher(AdvancedDispatcher):
             if sys.version_info >= (2, 7, 9):
                 self.tlsVersion = self.sslSocket.version()
                 logger.debug("%s:%i: TLS handshake success, TLS protocol version: %s",
-                        self.destination.host, self.destination.port, self.sslSocket.version())
+                             self.destination.host, self.destination.port, self.sslSocket.version())
             else:
                 self.tlsVersion = "TLSv1"
                 logger.debug("%s:%i: TLS handshake success", self.destination.host, self.destination.port)