Merge branch 'campaignmonitor:master' into master

Author: russella-acm

lib/createsend/utils.py

@@ -101,12 +101,21 @@ def connect(self):
 
         cert_path = os.path.join(os.path.dirname(__file__), 'cacert.pem')
 
-        self.sock = ssl.wrap_socket(
-            sock,
-            self.key_file,
-            self.cert_file,
-            cert_reqs=ssl.CERT_REQUIRED,
-            ca_certs=cert_path)
+        # for >= py3.7, mandatory since 3.12
+        if hasattr(ssl.SSLContext, 'wrap_socket'):
+            context = ssl.SSLContext()
+            context.verify_mode = ssl.CERT_REQUIRED
+            context.load_verify_locations(cert_path)
+            if hasattr(self, 'cert_file') and hasattr(self, 'key_file') and self.cert_file and self.key_file:
+                context.load_cert_chain(certfile=self.cert_file, keyfile=self.key_file)
+            self.sock = context.wrap_socket(sock)
+        else:
+            self.sock = ssl.wrap_socket(
+                sock,
+                self.key_file,
+                self.cert_file,
+                cert_reqs=ssl.CERT_REQUIRED,
+                ca_certs=cert_path)
 
         try:
             match_hostname(self.sock.getpeercert(), self.host)