tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ssl protocol

Browse Source
This commit is contained in:
Jean-Marc Martins 2013-12-13 15:17:30 +01:00
parent d765544edd
commit f377bd1356
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config
View File

@ -28,7 +28,7 @@ key = /etc/apache2/ssl/server.key
# SSL Protocol used. See python's ssl module for available values # SSL Protocol used. See python's ssl module for available values
protocol = PROTOCOL_SSLv23 protocol = PROTOCOL_SSLv23
# Ciphers available. See python's ssl module for available ciphers # Ciphers available. See python's ssl module for available ciphers
ciphers = None ciphers =
# Reverse DNS to resolve client address in logs # Reverse DNS to resolve client address in logs
dns_lookup = True dns_lookup = True
# Root URL of Radicale (starting and ending with a slash) # Root URL of Radicale (starting and ending with a slash)

2
radicale/__init__.py
View File

@ -100,7 +100,7 @@ class HTTPSServer(HTTPServer):
keyfile=config.get("server", "key"), keyfile=config.get("server", "key"),
ssl_version=getattr(ssl, config.get("server", "protocol"), ssl_version=getattr(ssl, config.get("server", "protocol"),
ssl.PROTOCOL_SSLv23), ssl.PROTOCOL_SSLv23),
ciphers=config.get("server", "ciphers")) ciphers=config.get("server", "ciphers") or None)
self.server_bind() self.server_bind()
self.server_activate() self.server_activate()

2
radicale/config.py
View File

@ -46,7 +46,7 @@ INITIAL_CONFIG = {
"certificate": "/etc/apache2/ssl/server.crt", "certificate": "/etc/apache2/ssl/server.crt",
"key": "/etc/apache2/ssl/server.key", "key": "/etc/apache2/ssl/server.key",
"protocol": "PROTOCOL_SSLv23", "protocol": "PROTOCOL_SSLv23",
"ciphers": None, "ciphers": "",
"dns_lookup": "True", "dns_lookup": "True",
"base_prefix": "/", "base_prefix": "/",
"realm": "Radicale - Password Required"}, "realm": "Radicale - Password Required"},