x/cloudbase-init
Code Issues Proposed changes

ssl: fix ERR_load_crypto_strings attribute error

Browse Source 
ERR_load_crypto_strings does not exist anymore in
OpenSSL > 1.1.0, thus leading to an AttributeError
in Python: openssl/include/openssl/err.h#L253

Change-Id: I1b135dcdd296f05703fee1c41441d4bac6fac37a
This commit is contained in:
Adrian Vladu 2019-05-10 12:27:37 +03:00
parent 405329ea4c
commit a2434e40e0
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cloudbaseinit/utils/crypt.py
View File

@ -92,8 +92,13 @@ openssl.ERR_error_string_n.argtypes = [ctypes.c_long,
ctypes.c_char_p, ctypes.c_char_p,
ctypes.c_int] ctypes.c_int]
openssl.ERR_load_crypto_strings.restype = ctypes.c_int try:
openssl.ERR_load_crypto_strings.argtypes = [] openssl.ERR_load_crypto_strings.restype = ctypes.c_int
openssl.ERR_load_crypto_strings.argtypes = []
except AttributeError:
# NOTE(avladu): This function is deprecated and no longer needed
# since OpenSSL 1.1
pass
clib.fopen.restype = ctypes.c_void_p clib.fopen.restype = ctypes.c_void_p
clib.fopen.argtypes = [ctypes.c_char_p, ctypes.c_char_p] clib.fopen.argtypes = [ctypes.c_char_p, ctypes.c_char_p]
@ -113,7 +118,11 @@ class OpenSSLException(CryptException):
super(OpenSSLException, self).__init__(message) super(OpenSSLException, self).__init__(message)
def _get_openssl_error_msg(self): def _get_openssl_error_msg(self):
openssl.ERR_load_crypto_strings() try:
openssl.ERR_load_crypto_strings()
except AttributeError:
pass
errno = openssl.ERR_get_error() errno = openssl.ERR_get_error()
errbuf = ctypes.create_string_buffer(1024) errbuf = ctypes.create_string_buffer(1024)
openssl.ERR_error_string_n(errno, errbuf, 1024) openssl.ERR_error_string_n(errno, errbuf, 1024)