diff --git a/src/Config.py b/src/Config.py index 599d4792..48e425dc 100644 --- a/src/Config.py +++ b/src/Config.py @@ -4,7 +4,7 @@ import ConfigParser class Config(object): def __init__(self): self.version = "0.3.1" - self.rev = 260 + self.rev = 267 self.parser = self.createArguments() argv = sys.argv[:] # Copy command line arguments argv = self.parseConfig(argv) # Add arguments from config file diff --git a/src/File/FileServer.py b/src/File/FileServer.py index 45c7b63a..c9fdcc31 100644 --- a/src/File/FileServer.py +++ b/src/File/FileServer.py @@ -78,7 +78,8 @@ class FileServer(ConnectionServer): message = re.sub("<.*?>", "", message.replace("
", " ").replace(" ", " ").strip()) # Strip http tags except Exception, err: message = "Error: %s" % Debug.formatException(err) - if "closed" in message: + data = "" + if "closed" in message or "Error" in message: self.log.info("[BAD :(] Port closed: %s" % message) if port == self.port: self.port_opened = False # Self port, update port_opened status diff --git a/src/lib/opensslVerify/opensslVerify.py b/src/lib/opensslVerify/opensslVerify.py index 0db92996..8dc005a1 100644 --- a/src/lib/opensslVerify/opensslVerify.py +++ b/src/lib/opensslVerify/opensslVerify.py @@ -404,7 +404,7 @@ def closeLibrary(): def getMessagePubkey(message, sig): pkey = ssl.EC_KEY_new_by_curve_name(NID_secp256k1) - if not pkey.value: + if type(pkey) is not int and not pkey.value: raise Exception( "OpenSSL %s (%s) EC_KEY_new_by_curve_name failed: %s, probably your OpenSSL lib does not support secp256k1 elliptic curve. Please check: https://github.com/HelloZeroNet/ZeroNet/issues/132" % (openssl_version, ssl._lib._name, pkey.value)