From 88ec9c297ef7f21cb78cbffaebf379e27c714453 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Sun, 20 Aug 2017 01:27:04 +0200 Subject: [PATCH] Improve libssl.py's file formatting --- telethon/crypto/aes.py | 2 +- telethon/crypto/libssl.py | 142 ++++++++++++++++++++------------------ 2 files changed, 75 insertions(+), 69 deletions(-) diff --git a/telethon/crypto/aes.py b/telethon/crypto/aes.py index 9bc1ba95..c09add56 100644 --- a/telethon/crypto/aes.py +++ b/telethon/crypto/aes.py @@ -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: diff --git a/telethon/crypto/libssl.py b/telethon/crypto/libssl.py index 58437ced..f9917d71 100644 --- a/telethon/crypto/libssl.py +++ b/telethon/crypto/libssl.py @@ -2,84 +2,90 @@ 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) + """ + # define AES_ENCRYPT 1 + # define AES_DECRYPT 0 + # define AES_MAXNR 14 + struct aes_key_st { + # ifdef AES_LONG + unsigned long rd_key[4 * (AES_MAXNR + 1)]; + # else + unsigned int rd_key[4 * (AES_MAXNR + 1)]; + # endif + int rounds; + }; + typedef struct aes_key_st AES_KEY; -""" -# define AES_ENCRYPT 1 -# define AES_DECRYPT 0 -# define AES_MAXNR 14 -struct aes_key_st { -# ifdef AES_LONG - unsigned long rd_key[4 * (AES_MAXNR + 1)]; -# else - unsigned int rd_key[4 * (AES_MAXNR + 1)]; -# endif - int rounds; -}; -typedef struct aes_key_st AES_KEY; + int AES_set_encrypt_key(const unsigned char *userKey, const int bits, + AES_KEY *key); + int AES_set_decrypt_key(const unsigned char *userKey, const int bits, + AES_KEY *key); + 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) -int AES_set_encrypt_key(const unsigned char *userKey, const int bits, - AES_KEY *key); -int AES_set_decrypt_key(const unsigned char *userKey, const int bits, - AES_KEY *key); -void AES_ige_encrypt(const unsigned char *in, unsigned char *out, - size_t length, const AES_KEY *key, - unsigned char *ivec, const int enc); -""" + AES_MAXNR = 14 + AES_ENCRYPT = ctypes.c_int(1) + AES_DECRYPT = ctypes.c_int(0) -AES_MAXNR = 14 -AES_ENCRYPT = ctypes.c_int(1) -AES_DECRYPT = ctypes.c_int(0) + class AES_KEY(ctypes.Structure): + _fields_ = [ + ('rd_key', ctypes.c_uint32 * (4*(AES_MAXNR + 1))), + ('rounds', ctypes.c_uint), + ] -class AES_KEY(ctypes.Structure): - _fields_ = [ - ('rd_key', ctypes.c_uint32 * (4*(AES_MAXNR + 1))), - ('rounds', ctypes.c_uint), - ] + class AES: + @staticmethod + def decrypt_ige(cipher_text, key, iv): + aeskey = AES_KEY() + ckey = (ctypes.c_ubyte * len(key))(*key) + cklen = ctypes.c_int(len(key)*8) + cin = (ctypes.c_ubyte * len(cipher_text))(*cipher_text) + ctlen = ctypes.c_size_t(len(cipher_text)) + cout = (ctypes.c_ubyte * len(cipher_text))() + civ = (ctypes.c_ubyte * len(iv))(*iv) -class AES: - @staticmethod - def decrypt_ige(cipher_text, key, iv): + _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 + ) - # declare types - aeskey = AES_KEY() - ckey = (ctypes.c_ubyte * len(key))(*key) - cklen = ctypes.c_int(len(key)*8) - cin = (ctypes.c_ubyte * len(cipher_text))(*cipher_text) - ctlen = ctypes.c_size_t(len(cipher_text)) - cout = (ctypes.c_ubyte * len(cipher_text))() - civ = (ctypes.c_ubyte * len(iv))(*iv) + return bytes(cout) - # 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) + @staticmethod + def encrypt_ige(plain_text, key, iv): + # 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) - return bytes(cout) + aeskey = AES_KEY() + ckey = (ctypes.c_ubyte * len(key))(*key) + cklen = ctypes.c_int(len(key)*8) + cin = (ctypes.c_ubyte * len(plain_text))(*plain_text) + ctlen = ctypes.c_size_t(len(plain_text)) + cout = (ctypes.c_ubyte * len(plain_text))() + civ = (ctypes.c_ubyte * len(iv))(*iv) - @staticmethod - def encrypt_ige(plain_text, key, iv): + _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 + ) - # Add random padding if and only if 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) - cin = (ctypes.c_ubyte * len(plain_text))(*plain_text) - ctlen = ctypes.c_size_t(len(plain_text)) - 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) - - return bytes(cout) + return bytes(cout)