summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCameron Tacklind <cameron@tacklind.com>2018-11-25 14:32:30 -0800
committerCameron Tacklind <cameron@tacklind.com>2018-11-25 14:32:30 -0800
commitd62987089e55d6afe7c85addbdcb6ab515db69ea (patch)
tree2fa913d0a225fe3450548aec3b539af23600965c
parente050905b291f4d9b417270e38f2aa04366057919 (diff)
downloaddeluge-1.3-stable.zip
deluge-1.3-stable.tar.gz
deluge-1.3-stable.tar.bz2
Allow using certificate chain files for secure SSL connections1.3-stable
-rw-r--r--ChangeLog1
-rw-r--r--deluge/core/rpcserver.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2899003..a80d8a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
==== Core ====
* Fix saving copy of torrent file for magnet links.
+ * Allow using certificate chain files for secure SSL connections.
=== Deluge 1.3.15 (12 May 2017) ===
diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py
index e3c3db1..80257f5 100644
--- a/deluge/core/rpcserver.py
+++ b/deluge/core/rpcserver.py
@@ -135,7 +135,7 @@ class ServerContextFactory(object):
ssl_dir = deluge.configmanager.get_config_dir("ssl")
ctx = SSL.Context(SSL.SSLv23_METHOD)
ctx.set_options(SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3)
- ctx.use_certificate_file(os.path.join(ssl_dir, "daemon.cert"))
+ ctx.use_certificate_chain_file(os.path.join(ssl_dir, "daemon.cert"))
ctx.use_privatekey_file(os.path.join(ssl_dir, "daemon.pkey"))
return ctx