Improve libssl.py's file formatting

This commit is contained in:
Lonami Exo 2017-08-20 01:27:04 +02:00
parent 274e16ac66
commit 88ec9c297e
2 changed files with 75 additions and 69 deletions

View File

@ -3,7 +3,7 @@ import pyaes
from . import libssl
if libssl.libssl:
if libssl.AES is not None:
# Use libssl if available, since it will be faster
AES = libssl.AES
else:

View File

@ -2,13 +2,10 @@ import os
import ctypes
from ctypes.util import find_library
# search and load libssl.so
lib = find_library('ssl')
if not lib:
libssl = None
AES = None
else:
libssl = ctypes.cdll.LoadLibrary(lib)
""" <aes.h>
# define AES_ENCRYPT 1
# define AES_DECRYPT 0
@ -31,6 +28,7 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
size_t length, const AES_KEY *key,
unsigned char *ivec, const int enc);
"""
_libssl = ctypes.cdll.LoadLibrary(lib)
AES_MAXNR = 14
AES_ENCRYPT = ctypes.c_int(1)
@ -45,8 +43,6 @@ class AES_KEY(ctypes.Structure):
class AES:
@staticmethod
def decrypt_ige(cipher_text, key, iv):
# declare types
aeskey = AES_KEY()
ckey = (ctypes.c_ubyte * len(key))(*key)
cklen = ctypes.c_int(len(key)*8)
@ -55,21 +51,25 @@ class AES:
cout = (ctypes.c_ubyte * len(cipher_text))()
civ = (ctypes.c_ubyte * len(iv))(*iv)
# decrypt
libssl.AES_set_decrypt_key(ckey, cklen, ctypes.byref(aeskey))
libssl.AES_ige_encrypt(ctypes.byref(cin), ctypes.byref(cout), ctlen, ctypes.byref(aeskey), ctypes.byref(civ), AES_DECRYPT)
_libssl.AES_set_decrypt_key(ckey, cklen, ctypes.byref(aeskey))
_libssl.AES_ige_encrypt(
ctypes.byref(cin),
ctypes.byref(cout),
ctlen,
ctypes.byref(aeskey),
ctypes.byref(civ),
AES_DECRYPT
)
return bytes(cout)
@staticmethod
def encrypt_ige(plain_text, key, iv):
# Add random padding if and only if it's not evenly divisible by 16 already
# Add random padding iff it's not evenly divisible by 16 already
if len(plain_text) % 16 != 0:
padding_count = 16 - len(plain_text) % 16
plain_text += os.urandom(padding_count)
# declare types
aeskey = AES_KEY()
ckey = (ctypes.c_ubyte * len(key))(*key)
cklen = ctypes.c_int(len(key)*8)
@ -78,8 +78,14 @@ class AES:
cout = (ctypes.c_ubyte * len(plain_text))()
civ = (ctypes.c_ubyte * len(iv))(*iv)
# encrypt
libssl.AES_set_encrypt_key(ckey, cklen, ctypes.byref(aeskey))
libssl.AES_ige_encrypt(ctypes.byref(cin), ctypes.byref(cout), ctlen, ctypes.byref(aeskey), ctypes.byref(civ), AES_ENCRYPT)
_libssl.AES_set_encrypt_key(ckey, cklen, ctypes.byref(aeskey))
_libssl.AES_ige_encrypt(
ctypes.byref(cin),
ctypes.byref(cout),
ctlen,
ctypes.byref(aeskey),
ctypes.byref(civ),
AES_ENCRYPT
)
return bytes(cout)