From 14c9ba1af655a6d53ab2ea6087f007c781014c2e Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 8 Oct 2014 20:48:16 +0200 Subject: [PATCH] adjust to netlib changes --- libpathod/pathod.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libpathod/pathod.py b/libpathod/pathod.py index 150e8799c..d3d0e959c 100644 --- a/libpathod/pathod.py +++ b/libpathod/pathod.py @@ -94,13 +94,14 @@ class PathodHandler(tcp.BaseHandler): self.wfile.flush() if not self.server.ssloptions.not_after_connect: try: - cert, key = self.server.ssloptions.get_cert(m.v[0]) + cert, key, chain_file = self.server.ssloptions.get_cert(m.v[0]) self.convert_to_ssl( cert, key, handle_sni=self.handle_sni, request_client_cert=self.server.ssloptions.request_client_cert, cipher_list=self.server.ssloptions.ciphers, method=self.server.ssloptions.sslversion, + chain_file=chain_file ) except tcp.NetLibError, v: s = str(v) @@ -211,13 +212,14 @@ class PathodHandler(tcp.BaseHandler): def handle(self): if self.server.ssl: try: - cert, key = self.server.ssloptions.get_cert(None) + cert, key, chain_file = self.server.ssloptions.get_cert(None) self.convert_to_ssl( cert, key, handle_sni=self.handle_sni, request_client_cert=self.server.ssloptions.request_client_cert, cipher_list=self.server.ssloptions.ciphers, method=self.server.ssloptions.sslversion, + chain_file=chain_file ) except tcp.NetLibError, v: s = str(v)