Merge pull request #112 from dhke/unbreak_starttls

fix starttls
tonioo · Apr 16, 2024 · f164615 · f164615
2 parents 3ccb90b + 21f0cde
commit f164615
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/sievelib/managesieve.py b/sievelib/managesieve.py
@@ -481,10 +481,12 @@ def __starttls(self, keyfile=None, certfile=None) -> bool:
         code, data = self.__send_command("STARTTLS")
         if code != "OK":
             return False
-        context = ssl.SSLContext()
+        context = ssl.create_default_context()
+        if certfile is not None:
+            context.load_cert_chain(certfile, keyfile=keyfile)
         try:
             # nsock = ssl.wrap_socket(self.sock, keyfile, certfile)
-            nsock = context.wrap_socket(self.sock, keyfile, certfile)
+            nsock = context.wrap_socket(self.sock, server_hostname=self.srvaddr)
         except ssl.SSLError as e:
             raise Error("SSL error: %s" % str(e))
         self.sock = nsock