feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

fixes socket calls

Browse Source
This commit is contained in:
Moisés Guimarães
2016-12-13 11:54:17 -03:00
parent f3c1522608
commit 4b75d11164
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wrapper/python/wolfssl/wolfssl/__init__.py
View File

@ -264,7 +264,7 @@ class SSLSocket(socket):
socket.__init__(self, socket.__init__(self,
family=sock.family, family=sock.family,
sock_type=sock.type, type=sock.type,
proto=sock.proto, proto=sock.proto,
fileno=sock.fileno()) fileno=sock.fileno())
self.settimeout(sock.gettimeout()) self.settimeout(sock.gettimeout())
@ -274,7 +274,7 @@ class SSLSocket(socket):
socket.__init__(self, fileno=fileno) socket.__init__(self, fileno=fileno)
else: else:
socket.__init__(self, family=family, sock_type=sock_type, socket.__init__(self, family=family, type=sock_type,
proto=proto) proto=proto)
# see if we are connected # see if we are connected
@ -306,7 +306,7 @@ class SSLSocket(socket):
self.do_handshake() self.do_handshake()
except: except:
self._release_native_object() self._release_native_object()
self._socket.close() self.close()
raise raise
@ -412,7 +412,7 @@ class SSLSocket(socket):
"read() on %s" % self.__class__) "read() on %s" % self.__class__)
data = t2b("\0" * length) data = t2b("\0" * length)
length = _lib.WolfSSL_read(self.native_object, data, length) length = _lib.wolfSSL_read(self.native_object, data, length)
if length < 0: if length < 0:
err = _lib.wolfSSL_get_error(self.native_object, 0) err = _lib.wolfSSL_get_error(self.native_object, 0)
@ -506,10 +506,10 @@ class SSLSocket(socket):
raise ValueError("attempt to connect already-connected SSLSocket!") raise ValueError("attempt to connect already-connected SSLSocket!")
if connect_ex: if connect_ex:
err = self._socket.connect_ex(addr) err = socket.connect_ex(self, addr)
else: else:
err = 0 err = 0
self._socket.connect(addr) socket.connect(self, addr)
if err == 0: if err == 0:
self._connected = True self._connected = True