diff --git a/tlslite/tlsconnection.py b/tlslite/tlsconnection.py index b19a3aa3..43dcf6ad 100644 --- a/tlslite/tlsconnection.py +++ b/tlslite/tlsconnection.py @@ -68,7 +68,7 @@ def __init__(self, sock): def handshakeClientAnonymous(self, session=None, settings=None, checker=None, serverName="", - async=False): + _async=False): """Perform an anonymous handshake in the role of client. This function performs an SSL or TLS handshake using an @@ -102,8 +102,8 @@ def handshakeClientAnonymous(self, session=None, settings=None, @type serverName: string @param serverName: The ServerNameIndication TLS Extension. - @type async: bool - @param async: If False, this function will block until the + @type _async: bool + @param _async: If False, this function will block until the handshake is completed. If True, this function will return a generator. Successive invocations of the generator will return 0 if it is waiting to read from the socket, 1 if it is @@ -111,7 +111,7 @@ def handshakeClientAnonymous(self, session=None, settings=None, the handshake operation is completed. @rtype: None or an iterable - @return: If 'async' is True, a generator object will be + @return: If '_async' is True, a generator object will be returned. @raise socket.error: If a socket error occurs. @@ -126,7 +126,7 @@ def handshakeClientAnonymous(self, session=None, settings=None, settings=settings, checker=checker, serverName=serverName) - if async: + if _async: return handshaker for result in handshaker: pass @@ -134,7 +134,7 @@ def handshakeClientAnonymous(self, session=None, settings=None, def handshakeClientSRP(self, username, password, session=None, settings=None, checker=None, reqTack=True, serverName="", - async=False): + _async=False): """Perform an SRP handshake in the role of client. This function performs a TLS/SRP handshake. SRP mutually @@ -179,8 +179,8 @@ def handshakeClientSRP(self, username, password, session=None, @type serverName: string @param serverName: The ServerNameIndication TLS Extension. - @type async: bool - @param async: If False, this function will block until the + @type _async: bool + @param _async: If False, this function will block until the handshake is completed. If True, this function will return a generator. Successive invocations of the generator will return 0 if it is waiting to read from the socket, 1 if it is @@ -188,7 +188,7 @@ def handshakeClientSRP(self, username, password, session=None, the handshake operation is completed. @rtype: None or an iterable - @return: If 'async' is True, a generator object will be + @return: If '_async' is True, a generator object will be returned. @raise socket.error: If a socket error occurs. @@ -206,9 +206,9 @@ def handshakeClientSRP(self, username, password, session=None, # fashion, returning 1 when it is waiting to able to write, 0 when # it is waiting to read. # - # If 'async' is True, the generator is returned to the caller, + # If '_async' is True, the generator is returned to the caller, # otherwise it is executed to completion here. - if async: + if _async: return handshaker for result in handshaker: pass @@ -216,7 +216,7 @@ def handshakeClientSRP(self, username, password, session=None, def handshakeClientCert(self, certChain=None, privateKey=None, session=None, settings=None, checker=None, nextProtos=None, reqTack=True, serverName="", - async=False): + _async=False): """Perform a certificate-based handshake in the role of client. This function performs an SSL or TLS handshake. The server @@ -273,8 +273,8 @@ def handshakeClientCert(self, certChain=None, privateKey=None, @type serverName: string @param serverName: The ServerNameIndication TLS Extension. - @type async: bool - @param async: If False, this function will block until the + @type _async: bool + @param _async: If False, this function will block until the handshake is completed. If True, this function will return a generator. Successive invocations of the generator will return 0 if it is waiting to read from the socket, 1 if it is @@ -282,7 +282,7 @@ def handshakeClientCert(self, certChain=None, privateKey=None, the handshake operation is completed. @rtype: None or an iterable - @return: If 'async' is True, a generator object will be + @return: If '_async' is True, a generator object will be returned. @raise socket.error: If a socket error occurs. @@ -301,9 +301,9 @@ def handshakeClientCert(self, certChain=None, privateKey=None, # fashion, returning 1 when it is waiting to able to write, 0 when # it is waiting to read. # - # If 'async' is True, the generator is returned to the caller, + # If '_async' is True, the generator is returned to the caller, # otherwise it is executed to completion here. - if async: + if _async: return handshaker for result in handshaker: pass