From: Victor Wagner Date: Fri, 6 Jun 2014 07:51:09 +0000 (+0400) Subject: Added more function declarations. Added @staticmethod to PKey.generate. Documented... X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=8afcf4f352ef2f967adbe84837d4abc5e9b6ee0c;p=oss%2Fctypescrypto.git Added more function declarations. Added @staticmethod to PKey.generate. Documented cipher.py and fixed some bugs --- diff --git a/README.md b/README.md index dfcab2b..2054f7b 100644 --- a/README.md +++ b/README.md @@ -37,11 +37,12 @@ digests.py - Interface to EVP\_Digest\* family of functions. Status: fully implemented and covered by tests ciphers.py - Interface to EVP\_Cipher family of function. - Status: Needs documenting and test coverage + Status: Needs test coverage pkey.py - Low-level private key operations (like pkey, genpkey and p keyutl command line ops), all via algorithm-agnostic EVP interface. - Status: Designed and started to implement but not yet covered by tests + Status: Designed and started to implement but most functionality + not yet covered by tests exception.py OpenSSL error stack to python exception conversion Implemented. diff --git a/ctypescrypto/bio.py b/ctypescrypto/bio.py index 92de35c..642b96b 100644 --- a/ctypescrypto/bio.py +++ b/ctypescrypto/bio.py @@ -64,3 +64,6 @@ libcrypto.BIO_ctrl.restype=c_long libcrypto.BIO_ctrl.argtypes=(c_void_p,c_int,c_long,POINTER(c_char_p)) libcrypto.BIO_read.argtypes=(c_void_p,c_char_p,c_int) libcrypto.BIO_write.argtypes=(c_void_p,c_char_p,c_int) +libcrypto.BIO_free.argtypes=(c_void_p,) +libcrypto.BIO_new_mem_buf.restype=c_void_p +libcrypto.BIO_new_mem_buf.argtypes=(c_char_p,c_int) diff --git a/ctypescrypto/cipher.py b/ctypescrypto/cipher.py index 4fb5767..1ea4f79 100644 --- a/ctypescrypto/cipher.py +++ b/ctypescrypto/cipher.py @@ -1,114 +1,211 @@ -from ctypes import create_string_buffer,c_char_p,c_void_p,c_int,c_long,byref -from ctypescrypto import libcrypto -from ctypescryto.exception import LibCrytoError - -CIPHER_ALGORITHMS = ("DES", "DES-EDE3", "BF", "AES-128", "AES-192", "AES-256") -CIPHER_MODES = ("STREAM","ECB","CBC", "CFB", "OFB", "CTR","GCM") - -# - -class CipherError(LibCryptoError): - pass - -def new(algname,key,encrypt=True,iv=None): - ct=CipherType(algname) - return Cipher(ct,key,iv,encrypt) - -class CipherType: - - def __init__(self, cipher_name): - self.cipher = libcrypto.EVP_get_cipherbyname(cipher_name) - if self.cipher is None: - raise CipherError, "Unknown cipher: %s" % cipher_name - - def __del__(self): - pass - def block_size(self): - return libcrypto.EVP_CIHPER_block_size(self.cipher) - def key_length(self): - return libcrypto.EVP_CIPHER_key_length(self.cipher) - def iv_length(self): - return libcrypto.EVP_CIPHER_iv_length(self.cipher) - def flags(self): - return libcrypto.EVP_CIPHER_flags(self.cipher) - def mode(self): - return CIPHER_MODES[self.flags & 0x7] - def algo(self): - return self.oid().short_name() - def mode(self): - return self.cipher_mode - def oid(self): - return Oid(libcrypto.EVP_CIPHER_nid(self.cipher)) - -class Cipher: - - def __init__(self, cipher_type, key, iv, encrypt=True): - self._clean_ctx() - key_ptr = c_char_p(key) - iv_ptr = c_char_p(iv) - self.ctx = libcrypto.EVP_CIPHER_CTX_new(cipher_type.cipher, None, key_ptr, iv_ptr) - if self.ctx == 0: - raise CipherError, "Unable to create cipher context" - self.encrypt = encrypt - if encrypt: - enc = 1 - else: - enc = 0 - result = libcrypto.EVP_CipherInit_ex(self.ctx, cipher_type.cipher, None, key_ptr, iv_ptr, c_int(enc)) - self.cipher_type = cipher_type - self.block_size = self.cipher_type.block_size() - if result == 0: - self._clean_ctx() - raise CipherError, "Unable to initialize cipher" - - def __del__(self): - self._clean_ctx() - - def enable_padding(self, padding=True): - if padding: - padding_flag = 1 - else: - padding_flag = 0 - libcrypto.EVP_CIPHER_CTX_set_padding(self.ctx, padding_flag) - - def update(self, data): - if self.cipher_finalized : - raise CipherError, "No updates allowed" - if type(data) != type(""): - raise TypeError, "A string is expected" - if len(data) <= 0: - return "" - outbuf=string_buffer_create(self.blocsize+len(data)) - outlen=c_int(0) - ret=libcrypto.EVP_CipherUpdate(self.ctx,outbuf,byref(outlen), - data,len(data)) - if ret <=0: - self._clean_ctx() - self.cipher_finalized=True - del self.ctx - raise CipherError("problem processing data") - return outbuf.raw[:outlen] - - def finish(self): - if self.cipher_finalized : - raise CipherError, "Cipher operation is already completed" - outbuf=create_string_buffer(self.block_size) - self.cipher_finalized = True - result = self.libcrypto.EVP_CipherFinal_ex(self.ctx,outbuf , byref(outlen)) - if result == 0: - self._clean_ctx() - raise CipherError, "Unable to finalize cipher" - if outlen>0: - return outbuf.raw[:outlen] - else - return "" - - def _clean_ctx(self): - try: - if self.ctx is not None: - self.libcrypto.EVP_CIPHER_CTX_cleanup(self.ctx) - self.libcrypto.EVP_CIPHER_CTX_free(self.ctx) - del(self.ctx) - except AttributeError: - pass - self.cipher_finalized = True +from ctypes import create_string_buffer,c_char_p,c_void_p,c_int,c_long,byref,POINTER +from ctypescrypto import libcrypto +from ctypescrypto.exception import LibCryptoError +from ctypescrypto.oid import Oid + +CIPHER_ALGORITHMS = ("DES", "DES-EDE3", "BF", "AES-128", "AES-192", "AES-256") +CIPHER_MODES = ("STREAM","ECB","CBC", "CFB", "OFB", "CTR","GCM") + +# + +class CipherError(LibCryptoError): + pass + +def new(algname,key,encrypt=True,iv=None): + """ + Returns new cipher object ready to encrypt-decrypt data + + @param algname - string algorithm name like in opemssl command + line + @param key - binary string representing ciher key + @param encrypt - if True (default) cipher would be initialized + for encryption, otherwise - for decrypton + @param iv - initialization vector + """ + ct=CipherType(algname) + return Cipher(ct,key,iv,encrypt) + +class CipherType: + """ + Describes cihper algorihm. Can be used to produce cipher + instance and to get various information about cihper + """ + + def __init__(self, cipher_name): + """ + Constructs cipher algortihm using textual name as in openssl + command line + """ + self.cipher = libcrypto.EVP_get_cipherbyname(cipher_name) + if self.cipher is None: + raise CipherError, "Unknown cipher: %s" % cipher_name + + def __del__(self): + pass + def block_size(self): + """ + Returns block size of the cipher + """ + return libcrypto.EVP_CIPHER_block_size(self.cipher) + def key_length(self): + """ + Returns key length of the cipher + """ + return libcrypto.EVP_CIPHER_key_length(self.cipher) + def iv_length(self): + """ + Returns initialization vector length of the cipher + """ + return libcrypto.EVP_CIPHER_iv_length(self.cipher) + def flags(self): + """ + Return cipher flags. Low three bits of the flags encode + cipher mode (see mode). Higher bits is combinatuon of + EVP_CIPH* constants defined in the + """ + return libcrypto.EVP_CIPHER_flags(self.cipher) + def mode(self): + """ + Returns cipher mode as string constant like CBC, OFB etc. + """ + return CIPHER_MODES[self.flags() & 0x7] + def algo(self): + """ + Return cipher's algorithm name, derived from OID + """ + return self.oid().short_name() + def oid(self): + """ + Returns ASN.1 object identifier of the cipher as + ctypescrypto.oid.Oid object + """ + return Oid(libcrypto.EVP_CIPHER_nid(self.cipher)) + +class Cipher: + """ + Performs actual encrypton decryption + Note that object keeps some internal state. + To obtain full ciphertext (or plaintext during decihpering) + user should concatenate results of all calls of update with + result of finish + """ + def __init__(self, cipher_type, key, iv, encrypt=True): + """ + Initializing cipher instance. + + @param cipher_type - CipherType object + @param key = binary string representing the key + @param iv - binary string representing initializtion vector + @param encrypt - if True(default) we ere encrypting. + Otherwise decrypting + + """ + self._clean_ctx() + key_ptr = c_char_p(key) + iv_ptr = c_char_p(iv) + self.ctx = libcrypto.EVP_CIPHER_CTX_new() + if self.ctx == 0: + raise CipherError, "Unable to create cipher context" + self.encrypt = encrypt + if encrypt: + enc = 1 + else: + enc = 0 + result = libcrypto.EVP_CipherInit_ex(self.ctx, cipher_type.cipher, None, key_ptr, iv_ptr, c_int(enc)) + if result == 0: + self._clean_ctx() + raise CipherError, "Unable to initialize cipher" + self.cipher_type = cipher_type + self.block_size = self.cipher_type.block_size() + self.cipher_finalized = False + + def __del__(self): + self._clean_ctx() + + def padding(self, padding=True): + """ + Sets padding mode of the cipher + """ + if padding: + padding_flag = 1 + else: + padding_flag = 0 + libcrypto.EVP_CIPHER_CTX_set_padding(self.ctx, padding_flag) + + def update(self, data): + """ + Performs actual encrypton/decrypion + + @param data - part of the plain text/ciphertext to process + @returns - part of ciphercext/plain text + + Passd chunk of text doeesn't need to contain full ciher + blocks. If neccessery, part of passed data would be kept + internally until next data would be received or finish + called + """ + if self.cipher_finalized : + raise CipherError, "No updates allowed" + if type(data) != type(""): + raise TypeError, "A string is expected" + if len(data) <= 0: + return "" + outbuf=create_string_buffer(self.block_size+len(data)) + outlen=c_int(0) + ret=libcrypto.EVP_CipherUpdate(self.ctx,outbuf,byref(outlen), + data,len(data)) + if ret <=0: + self._clean_ctx() + self.cipher_finalized=True + del self.ctx + raise CipherError("problem processing data") + return outbuf.raw[:outlen.value] + + def finish(self): + """ + Finalizes processing. If some data are kept in the internal + state, they would be processed and returned. + """ + if self.cipher_finalized : + raise CipherError, "Cipher operation is already completed" + outbuf=create_string_buffer(self.block_size) + self.cipher_finalized = True + outlen=c_int() + result = libcrypto.EVP_CipherFinal_ex(self.ctx,outbuf , byref(outlen)) + if result == 0: + self._clean_ctx() + raise CipherError, "Unable to finalize cipher" + if outlen.value>0: + return outbuf.raw[:outlen.value] + else: + return "" + + def _clean_ctx(self): + try: + if self.ctx is not None: + self.libcrypto.EVP_CIPHER_CTX_cleanup(self.ctx) + self.libcrypto.EVP_CIPHER_CTX_free(self.ctx) + del(self.ctx) + except AttributeError: + pass + self.cipher_finalized = True + + +# +# Used C function block_size +# +libcrypto.EVP_CIPHER_block_size.argtypes=(c_void_p,) +libcrypto.EVP_CIPHER_CTX_cleanup.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 +libcrypto.EVP_get_cipherbyname.argtypes=(c_char_p,) + diff --git a/ctypescrypto/engine.py b/ctypescrypto/engine.py index 47f4878..f05fcb0 100644 --- a/ctypescrypto/engine.py +++ b/ctypescrypto/engine.py @@ -25,3 +25,4 @@ libcrypto.ENGINE_by_id.restype=c_void_p libcrypto.ENGINE_by_id.argtypes=(c_char_p,) libcrypto.ENGINE_set_default.argtypes=(c_void_p,c_int) libcrypto.ENGINE_ctrl_cmd_string.argtypes=(c_void_p,c_char_p,c_char_p,c_int) +libcrypto.ENGINE_finish.argtypes=(c_char_p,) diff --git a/ctypescrypto/pkey.py b/ctypescrypto/pkey.py index bb99533..50dccd0 100644 --- a/ctypescrypto/pkey.py +++ b/ctypescrypto/pkey.py @@ -139,6 +139,7 @@ class PKey: raise PKeyError("computing actual shared key") libcrypto.EVP_PKEY_CTX_free(ctx) return buf.raw[:keylen] + @staticmethod def generate(algorithm,**kwargs): """ Generates new private-public key pair for given algorithm @@ -174,11 +175,11 @@ class PKey: libcrypto.EVP_PKEY_cmp.argtypes=(c_void_p,c_void_p) libcrypto.PEM_read_bio_PrivateKey.restype=c_void_p libcrypto.PEM_read_bio_PrivateKey.argtypes=(c_void_p,POINTER(c_void_p),CALLBACK_FUNC,c_char_p) -libcrypto.d2i_PKCS8PrivateKey_bio.restype=c_void_p -libcrypto.d2i_PKCS8PrivateKey_bio.argtypes=(c_void_p,POINTER(c_void_p),CALLBACK_FUNC,c_char_p) libcrypto.PEM_read_bio_PUBKEY.restype=c_void_p libcrypto.PEM_read_bio_PUBKEY.argtypes=(c_void_p,POINTER(c_void_p),CALLBACK_FUNC,c_char_p) libcrypto.d2i_PUBKEY_bio.restype=c_void_p libcrypto.d2i_PUBKEY_bio.argtypes=(c_void_p,c_void_p) +libcrypto.d2i_PrivateKey_bio.restype=c_void_p +libcrypto.d2i_PrivateKey_bio.argtypes=(c_void_p,c_void_p) libcrypto.EVP_PKEY_print_public.argtypes=(c_void_p,c_void_p,c_int,c_void_p)