From 9aae3213b9ebaa1ba1d23790fe4ccc5e03140cf4 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Fri, 5 Jan 2018 22:46:23 +0100 Subject: rename TLS/SSL-related attributes SSL is an outdated protocol superseeded by TLS. Although the commonly used library is called OpenSSL, it is no reason to still use outdated language for attributes. --- pathod/pathod.py | 2 +- pathod/protocols/websockets.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pathod') diff --git a/pathod/pathod.py b/pathod/pathod.py index f8e64f9e..8abeaf41 100644 --- a/pathod/pathod.py +++ b/pathod/pathod.py @@ -170,7 +170,7 @@ class PathodHandler(tcp.BaseHandler): ), cipher=None, ) - if self.ssl_established: + if self.tls_established: retlog["cipher"] = self.get_current_cipher() m = utils.MemBool() diff --git a/pathod/protocols/websockets.py b/pathod/protocols/websockets.py index 2d1f1bf6..63e6ee0b 100644 --- a/pathod/protocols/websockets.py +++ b/pathod/protocols/websockets.py @@ -30,7 +30,7 @@ class WebsocketsProtocol: ), cipher=None, ) - if self.pathod_handler.ssl_established: + if self.pathod_handler.tls_established: retlog["cipher"] = self.pathod_handler.get_current_cipher() self.pathod_handler.addlog(retlog) ld = language.websockets.NESTED_LEADER -- cgit v1.2.3 From d15e96dee1d6c3c752434663bf6ea8a547d09d28 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Sat, 6 Jan 2018 10:43:33 +0100 Subject: rename TLS/SSL-related functions SSL is an outdated protocol superseeded by TLS. Although the commonly used library is called OpenSSL, it is no reason to still use outdated language for function names. --- pathod/pathoc.py | 2 +- pathod/pathod.py | 2 +- pathod/protocols/http.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pathod') diff --git a/pathod/pathoc.py b/pathod/pathoc.py index e5fe4c2d..39a25b43 100644 --- a/pathod/pathoc.py +++ b/pathod/pathoc.py @@ -313,7 +313,7 @@ class Pathoc(tcp.TCPClient): if self.use_http2: alpn_protos.append(b'h2') - self.convert_to_ssl( + self.convert_to_tls( sni=self.sni, cert=self.clientcert, method=self.ssl_version, diff --git a/pathod/pathod.py b/pathod/pathod.py index 8abeaf41..17db57ee 100644 --- a/pathod/pathod.py +++ b/pathod/pathod.py @@ -244,7 +244,7 @@ class PathodHandler(tcp.BaseHandler): if self.server.ssl: try: cert, key, _ = self.server.ssloptions.get_cert(None) - self.convert_to_ssl( + self.convert_to_tls( cert, key, handle_sni=self.handle_sni, diff --git a/pathod/protocols/http.py b/pathod/protocols/http.py index 4387b4fb..5fcb6618 100644 --- a/pathod/protocols/http.py +++ b/pathod/protocols/http.py @@ -27,7 +27,7 @@ class HTTPProtocol: cert, key, chain_file_ = self.pathod_handler.server.ssloptions.get_cert( connect[0].encode() ) - self.pathod_handler.convert_to_ssl( + self.pathod_handler.convert_to_tls( cert, key, handle_sni=self.pathod_handler.handle_sni, -- cgit v1.2.3 From 4fb894cad4cf1c1d4a89eef8af35d4523a198f28 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Sat, 6 Jan 2018 10:50:26 +0100 Subject: avoid TLS/SSL ambiguity for Cert class --- pathod/pathoc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pathod') diff --git a/pathod/pathoc.py b/pathod/pathoc.py index 39a25b43..b177d556 100644 --- a/pathod/pathoc.py +++ b/pathod/pathoc.py @@ -79,7 +79,7 @@ class SSLInfo: } t = types.get(pk.type(), "Uknown") parts.append("\tPubkey: %s bit %s" % (pk.bits(), t)) - s = certs.SSLCert(i) + s = certs.Cert(i) if s.altnames: parts.append("\tSANs: %s" % " ".join(strutils.always_str(n, "utf8") for n in s.altnames)) return "\n".join(parts) -- cgit v1.2.3