oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rev2130, Use SslPatch to load openssl library, Fix Android 6 openssl loading

Browse source
This commit is contained in:
shortcutme 2017-07-04 01:12:58 +02:00
parent ebbe19131b
commit f30b2b6fc2
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
4 changed files with 43 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/lib/opensslVerify/opensslVerify.py
View file

@ -194,24 +194,15 @@ ssl = None
def openLibrary():
global ssl
try:
if sys.platform.startswith("win"):
dll_path = os.path.dirname(os.path.abspath(__file__)) + "/" + "libeay32.dll"
elif sys.platform == "cygwin":
dll_path = "/bin/cygcrypto-1.0.0.dll"
elif os.path.isfile("../lib/libcrypto.so"): # ZeroBundle OSX
dll_path = "../lib/libcrypto.so"
elif os.path.isfile("/opt/lib/libcrypto.so.1.0.0"): # For optware and entware
dll_path = "/opt/lib/libcrypto.so.1.0.0"
else:
dll_path = "/usr/local/ssl/lib/libcrypto.so"
ssl = _OpenSSL(dll_path)
assert ssl
except Exception, err:
ssl = _OpenSSL(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') or 'libeay32')
import util.SslPatch
ssl = _OpenSSL(util.SslPatch.getLibraryPath())
logging.debug("opensslVerify loaded: %s", ssl._lib)
openLibrary()
if __name__ == "__main__":
ssl = _OpenSSL(sys.argv[1])
else:
openLibrary()
openssl_version = "%.9X" % ssl._lib.SSLeay()
NID_secp256k1 = 714
@ -461,4 +452,4 @@ if __name__ == "__main__":
for i in range(1000):
pubkey = getMessagePubkey("hello", sign)
verified = btctools.pubkey_to_address(pubkey) == address
print "100x Verified", verified, time.time() - s
print "1000x Verified", verified, time.time() - s

18
src/lib/pyelliptic/openssl.py
View file

@ -496,21 +496,9 @@ class _OpenSSL:
def loadOpenSSL():
import logging
import util.SslPatch
global OpenSSL
try:
if sys.platform.startswith("win"):
dll_path = os.path.normpath(os.path.dirname(__file__) + "/../opensslVerify/" + "libeay32.dll")
elif sys.platform == "cygwin":
dll_path = "/bin/cygcrypto-1.0.0.dll"
elif os.path.isfile("../lib/libcrypto.so"): # ZeroBundle OSX
dll_path = "../lib/libcrypto.so"
else:
dll_path = "/usr/local/ssl/lib/libcrypto.so"
ssl = _OpenSSL(dll_path)
assert ssl
except Exception, err:
ssl = _OpenSSL(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') or 'libeay32')
OpenSSL = ssl
logging.debug("pyelliptic loaded: %s", ssl._lib)
OpenSSL = _OpenSSL(util.SslPatch.getLibraryPath())
logging.debug("pyelliptic loaded: %s", OpenSSL._lib)
loadOpenSSL()