Guillaume Ayoub преди 9 години
родител
ревизия
fd1742fcea
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 2 2
      radicale/__init__.py
  2. 1 1
      radicale/__main__.py

+ 2 - 2
radicale/__init__.py

@@ -102,7 +102,7 @@ class HTTPSServer(HTTPServer):
     certificate = None
     key = None
     protocol = None
-    cyphers = None
+    ciphers = None
 
     def __init__(self, address, handler):
         """Create server by wrapping HTTP socket in an SSL socket."""
@@ -110,7 +110,7 @@ class HTTPSServer(HTTPServer):
 
         self.socket = ssl.wrap_socket(
             self.socket, self.key, self.certificate, server_side=True,
-            ssl_version=self.protocol, cyphers=self.cyphers)
+            ssl_version=self.protocol, ciphers=self.ciphers)
 
         self.server_bind()
         self.server_activate()

+ 1 - 1
radicale/__main__.py

@@ -162,7 +162,7 @@ def serve(configuration, logger):
         server_class = ThreadedHTTPSServer
         server_class.certificate = configuration.get("server", "certificate")
         server_class.key = configuration.get("server", "key")
-        server_class.cyphers = configuration.get("server", "cyphers")
+        server_class.ciphers = configuration.get("server", "ciphers")
         server_class.certificate = getattr(
             ssl, configuration.get("server", "protocol"), ssl.PROTOCOL_SSLv23)
         # Test if the SSL files can be read