X-Git-Url: https://www.wagner.pp.ru/gitweb/?a=blobdiff_plain;f=ctypescrypto%2F__init__.py;h=a63fed425bdd9abe07d09ce915bb17030968f376;hb=876630b04080b68d724e22066d374ce25efd8a97;hp=7ae712565d643d6ac7621652cdc061e9976ba754;hpb=ff669c32aa77c9ebfb9c5371b2c8a9d41de614f8;p=oss%2Fctypescrypto.git

diff --git a/ctypescrypto/__init__.py b/ctypescrypto/__init__.py
index 7ae7125..a63fed4 100644
--- a/ctypescrypto/__init__.py
+++ b/ctypescrypto/__init__.py
@@ -1,20 +1,40 @@
 """
-	Interface to some libcrypto functions
+    Interface to some libcrypto functions
 
 """
 
 
-from ctypes import CDLL,c_char_p
+from ctypes import CDLL, c_char_p, c_void_p, c_long,c_uint64
+from ctypes.util import find_library
+import sys
+global strings_loaded
 
 def config(filename=None):
-	"""
-		Loads OpenSSL Config file. If none are specified, loads default
-		(compiled in) one
-	"""
-	libcrypto.OPENSSL_config(filename)
+    """
+        Loads OpenSSL Config file. If none are specified, loads default
+        (compiled in) one
+    """
+    libcrypto.OPENSSL_config(filename)
 
 __all__ = ['config']
 
-libcrypto = CDLL("libcrypto.so.1.0.0")
-libcrypto.OPENSSL_config.argtypes=(c_char_p,)
-libcrypto.OPENSSL_add_all_algorithms_conf()
+if sys.platform.startswith('win'):
+    __libname__ = find_library('libeay32')
+else:
+    __libname__ = find_library('crypto')
+
+if __libname__ is None:
+    raise OSError("Cannot find OpenSSL crypto library")
+
+#__libname__ = "/usr/local/ssl/lib/libcrypto.so.1.1"
+
+libcrypto = CDLL(__libname__)
+libcrypto.OPENSSL_config.argtypes = (c_char_p, )
+
+if hasattr(libcrypto,'OPENSSL_init_crypto'):
+    libcrypto.OPENSSL_init_crypto.argtypes = (c_uint64,c_void_p)
+    libcrypto.OPENSSL_init_crypto(2+4+8+0x40,None)
+    strings_loaded = True
+else:     
+    libcrypto.OPENSSL_add_all_algorithms_conf()
+    strings_loaded = False