Begin to implement python3 support. Now tests for oid, bio, cipher, digest, mac and...

[oss/ctypescrypto.git] / ctypescrypto / __init__.py

diff --git a/ctypescrypto/__init__.py b/ctypescrypto/__init__.py
index 1213398b08ff7069421841fe090175cd9ff6f7de..e9d9f1410b8c0a4a9c5ab257eeb0e1645ebca738 100644 (file)
--- a/ctypescrypto/__init__.py
+++ b/ctypescrypto/__init__.py
@@ -4,9 +4,10 @@
 """
 
 
-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):
     """
@@ -29,4 +30,20 @@ if __libname__ is None:
 
 libcrypto = CDLL(__libname__)
 libcrypto.OPENSSL_config.argtypes = (c_char_p, )
-libcrypto.OPENSSL_add_all_algorithms_conf()
+pyver=int(sys.version[0])
+if pyver == 2:
+    bintype = str
+    chartype = unicode
+    inttype = (int, long)
+else:
+    bintype = bytes
+    chartype = str
+    inttype = int
+
+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