diff --git a/CHANGELOG.md b/CHANGELOG.md index 6955f642..5a7d04ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +## ZeroNet 0.5.5 (2017-05-18) +### Added +- Outgoing socket binding by --bind parameter +- Database rebuilding progress bar +- Protect low traffic site's peers from cleanup closing +- Local site blacklisting +- Cloned site source code upgrade from parent +- Input placeholder support for displayPrompt +- Alternative interaction for wrapperConfirm + +### Changed +- New file priorities for faster site display on first visit +- Don't add ? to url if push/replaceState url starts with # + +### Fixed +- PermissionAdd/Remove admin command requirement +- Multi-line confirmation dialog + + ## ZeroNet 0.5.4 (2017-04-14) ### Added - Major speed and CPU usage enhancements in Tor always mode diff --git a/src/Config.py b/src/Config.py index 84e7b803..90181759 100644 --- a/src/Config.py +++ b/src/Config.py @@ -10,7 +10,7 @@ class Config(object): def __init__(self, argv): self.version = "0.5.5" - self.rev = 2089 + self.rev = 2090 self.argv = argv self.action = None self.config_file = "zeronet.conf" diff --git a/src/util/SslPatch.py b/src/util/SslPatch.py index b5d3fc55..29dba5ed 100644 --- a/src/util/SslPatch.py +++ b/src/util/SslPatch.py @@ -3,6 +3,7 @@ import logging import os +import sys from Config import config @@ -17,12 +18,12 @@ def openLibrary(): dll_path = "/bin/cygcrypto-1.0.0.dll" else: dll_path = "/usr/local/ssl/lib/libcrypto.so" - ssl = ctypes.CDLL(dll_path, ctypes.RTLD_GLOBAL) - assert ssl + ssl_lib = ctypes.CDLL(dll_path, ctypes.RTLD_GLOBAL) + assert ssl_lib except: - dll_path = ctypes.util.find_library('ssl') or ctypes.util.find_library('crypto') or ctypes.util.find_library('libcrypto') - ssl = ctypes.CDLL(dll_path or 'libeay32', ctypes.RTLD_GLOBAL) - return ssl + dll_path = ctypes.util.find_library('ssl.so.1.0') or ctypes.util.find_library('ssl') or ctypes.util.find_library('crypto') or ctypes.util.find_library('libcrypto') + ssl_lib = ctypes.CDLL(dll_path or 'libeay32', ctypes.RTLD_GLOBAL) + return ssl_lib def disableSSLCompression():