Changeset 134 for trunk

Timestamp:

10/24/17 12:20:54 (7 years ago)

Author:

tim

Message:

cleanup

File:

• trunk/lib/bletchley/ssltls.py (modified) (2 diffs)

trunk/lib/bletchley/ssltls.py

@@ -31 +31 @@
     sys.stderr.write('       # apt-get install python3-openssl\n')
     sys.stderr.write('NOTE: pyOpenSSL version 0.14 or later is required!\n')
-    sys.exit(2)
-try:
-    import cffi
-except:
-    sys.stderr.write('ERROR: Could not locate cffi module.  Under Debian-based systems, try:\n')
-    sys.stderr.write('       # apt-get install python3-cffi\n')
-    sys.stderr.write('NOTE: This is a requirement because pyOpenSSL does not provide '
-                     'certificate extension removal procedures.  Consider lobbying for the '
-                     'implementation of this:\n  https://github.com/pyca/pyopenssl/issues/152\n')
     sys.exit(2)
 
@@ -216 +207 @@
     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
-
     #print(certificate._x509, index)
     #print(libssl.X509_get_ext_count(certificate._x509))