Skip to content

Update cipher.py Functions renamed in OpenSSL 3 #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alex-eri wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update cipher.py Functions renamed in OpenSSL 3 #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions ctypescrypto/cipher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,28 +239,47 @@ def _clean_ctx(self):
self.cipher_finalized = True


#
# Used C function block_size
#
libcrypto.EVP_CIPHER_block_size.argtypes = (c_void_p, )


#Function EVP_CIPHER_CTX_cleanup renamed to EVP_CIPHER_CTX_reset
# in the OpenSSL 1.1.0
if hasattr(libcrypto,"EVP_CIPHER_CTX_cleanup"):
Cipher.__ctxcleanup = libcrypto.EVP_CIPHER_CTX_cleanup
else:
Cipher.__ctxcleanup = libcrypto.EVP_CIPHER_CTX_reset




# Functions ramned in OpenSSL 3
if hasattr(libcrypto, "OPENSSL_version_major") and libcrypto.OPENSSL_version_major() >= 3:
libcrypto.EVP_CIPHER_get_block_size.argtypes = (c_void_p, )
libcrypto.EVP_CIPHER_get_iv_length.argtypes = (c_void_p, )
libcrypto.EVP_CIPHER_get_key_length.argtypes = (c_void_p, )
libcrypto.EVP_CIPHER_get_nid.argtypes = (c_void_p, )
libcrypto.EVP_CIPHER_get_flags.argtypes = (c_void_p, )

libcrypto.EVP_CIPHER_block_size = libcrypto.EVP_CIPHER_get_block_size
libcrypto.EVP_CIPHER_iv_length = libcrypto.EVP_CIPHER_get_iv_length
libcrypto.EVP_CIPHER_key_length = libcrypto.EVP_CIPHER_get_key_length
libcrypto.EVP_CIPHER_nid = libcrypto.EVP_CIPHER_get_nid
libcrypto.EVP_CIPHER_flags = libcrypto.EVP_CIPHER_get_flags

else:
libcrypto.EVP_CIPHER_block_size.argtypes = (c_void_p, )
libcrypto.EVP_CIPHER_iv_length.argtypes = (c_void_p, )
libcrypto.EVP_CIPHER_key_length.argtypes = (c_void_p, )
libcrypto.EVP_CIPHER_nid.argtypes = (c_void_p, )
libcrypto.EVP_CIPHER_flags.argtypes = (c_void_p, )


Cipher.__ctxcleanup.argtypes = (c_void_p, )
libcrypto.EVP_CIPHER_CTX_free.argtypes = (c_void_p, )
libcrypto.EVP_CIPHER_CTX_new.restype = c_void_p
libcrypto.EVP_CIPHER_CTX_set_padding.argtypes = (c_void_p, c_int)
libcrypto.EVP_CipherFinal_ex.argtypes = (c_void_p, c_char_p, POINTER(c_int))
libcrypto.EVP_CIPHER_flags.argtypes = (c_void_p, )
libcrypto.EVP_CipherInit_ex.argtypes = (c_void_p, c_void_p, c_void_p, c_char_p,
c_char_p, c_int)
libcrypto.EVP_CIPHER_iv_length.argtypes = (c_void_p, )
libcrypto.EVP_CIPHER_key_length.argtypes = (c_void_p, )
libcrypto.EVP_CIPHER_nid.argtypes = (c_void_p, )
libcrypto.EVP_CipherUpdate.argtypes = (c_void_p, c_char_p, POINTER(c_int),
c_char_p, c_int)
libcrypto.EVP_get_cipherbyname.restype = c_void_p
Expand Down