Changeset 133

Timestamp:

10/24/17 12:09:55 (7 years ago)

Author:

tim

Message:

fixed segfault in certificate cloning. now using pyopenssl's cffi object for interfacing with the C library

File:

• trunk/lib/bletchley/ssltls.py (modified) (1 diff)

trunk/lib/bletchley/ssltls.py

@@ -214 +214 @@
     https://github.com/pyca/pyopenssl/issues/152
     '''
-    ffi = cffi.FFI()
-    ffi.cdef('''void* X509_delete_ext(void* x, int loc);''')
-
+    from OpenSSL._util import lib as libssl
+
+    #ffi = cffi.FFI()
+    #ffi.cdef('''void* X509_delete_ext(void* x, int loc);''')
+    #ffi.cdef('''int X509_get_ext_count(const void* x);''')
+    
     # Try to load libssl using several recent names because package
     # maintainers have the blinders on and don't have a universal
     # symlink to the most recent version.
-    libssl = None
-    for libname in ('libssl.so','libssl.so.1.0.2', 'libssl.so.1.0.1', 'libssl.so.1.0.0','libssl.so.0.9.8'):
-        try:
-            libssl = ffi.dlopen(libname)
-            break
-        except OSError as e:
-            pass
-    
+    
+    #libssl = None
+    #for libname in ('libssl.so','libssl.so.1.0.2', 'libssl.so.1.0.1', 'libssl.so.1.0.0','libssl.so.0.9.8'):
+    #    try:
+    #        libssl = ffi.dlopen(libname)
+    #        break
+    #    except OSError as e:
+    #        pass
+
+    #print(certificate._x509, index)
+    #print(libssl.X509_get_ext_count(certificate._x509))
     ext = libssl.X509_delete_ext(certificate._x509, index)
     #XXX: memory leak.  supposed to free ext here