diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-08-11 07:37:43 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-08-11 07:37:43 -0400 |
| commit | b19736c8ffdb2bfe243097cae55b60d855e7a0fe (patch) | |
| tree | 536d19860e876e02d6cefb57a49d1fd2418b4008 | |
| parent | 18b3337075afa9a98742e87cb525a21feae183f0 (diff) | |
| download | cryptography-b19736c8ffdb2bfe243097cae55b60d855e7a0fe.tar.gz cryptography-b19736c8ffdb2bfe243097cae55b60d855e7a0fe.tar.bz2 cryptography-b19736c8ffdb2bfe243097cae55b60d855e7a0fe.zip | |
Addressed a TODO
| -rw-r--r-- | cryptography/bindings/openssl/api.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cryptography/bindings/openssl/api.py b/cryptography/bindings/openssl/api.py index ee07dbcd..2da156cd 100644 --- a/cryptography/bindings/openssl/api.py +++ b/cryptography/bindings/openssl/api.py @@ -62,6 +62,8 @@ class API(object): unsigned char *, int); int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *, unsigned char *, int *); int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *); + EVP_CIPHER *EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *); + int EVP_CIPHER_block_size(const EVP_CIPHER *); unsigned long ERR_get_error(); """) @@ -101,8 +103,9 @@ class API(object): return self._ffi.buffer(buf)[:outlen[0]] def finalize_encrypt_context(self, ctx): - # TODO: use real block size - buf = self._ffi.new("unsigned char[]", 16) + cipher = self._lib.EVP_CIPHER_CTX_cipher(ctx) + block_size = self._lib.EVP_CIPHER_block_size(cipher) + buf = self._ffi.new("unsigned char[]", block_size) outlen = self._ffi.new("int *") res = self._lib.EVP_EncryptFinal_ex(ctx, buf, outlen) if res == 0: |