diff options
| author |  spoob <spoob@gmx.de>
| 2009-12-05 20:31:00 +0100 |
|---|---|---|
| committer | spoob <spoob@gmx.de>
| 2009-12-05 20:31:00 +0100 |
| commit | a6c7715dfb4946a4a25edd4f8bc3cc2e2249e4f9 (patch) | |
| tree | 4ee126ca60503ace6bdeb10870ffff385a8450fd | |
| parent | linksave.in captcha test (diff) | |
| download | pyload-a6c7715dfb4946a4a25edd4f8bc3cc2e2249e4f9.tar.xz | |
No OpenSSL needed to run
| -rw-r--r-- | module/remote/SecureXMLRPCServer.py | 2 | ||||
| -rwxr-xr-x | pyLoadCore.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/module/remote/SecureXMLRPCServer.py b/module/remote/SecureXMLRPCServer.py index 9dacd7b26..7a60f6c90 100644 --- a/module/remote/SecureXMLRPCServer.py +++ b/module/remote/SecureXMLRPCServer.py @@ -16,7 +16,6 @@ # $Id: SecureXMLRPCServer.py 5 2007-01-06 17:54:13Z hoffie $ from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler -from OpenSSL import SSL import SocketServer import socket import base64 @@ -41,6 +40,7 @@ class SecureSocketConnection: class SecureSocketServer(SocketServer.TCPServer, SocketServer.ThreadingMixIn): def __init__(self, addr, cert, key, requestHandler, verify_cert_func=None): + SSL = __import__("OpenSSL", globals(), locals(), "SSL", -1).SSL SocketServer.TCPServer.__init__(self, addr, requestHandler) ctx = SSL.Context(SSL.SSLv23_METHOD) if not verify_cert_func and hasattr(self, 'verify_client_cert'): diff --git a/pyLoadCore.py b/pyLoadCore.py index eedb547bf..e97b1fcaf 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -122,6 +122,7 @@ class Core(object): self.check_file(self.config['general']['link_file'], _("file for links"), False) self.check_file(self.config['general']['failed_file'], _("file for failed links"), False) if self.config['ssl']['activated']: + self.check_install("OpenSSL", "OpenSLL for secure connection", True) self.check_file(self.config['ssl']['cert'], _("ssl certificate"), False, False, True) self.check_file(self.config['ssl']['key'], _("ssl key"), False, False, True) |