From 5113680f95e522c677cdd37072cfffbdca06831e Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Mon, 10 Apr 2006 08:07:38 +0000 Subject: - split up in libstrong, charon, stroke, testing done - new leak detective with malloc hook in library - useable, but needs improvements - logger_manager has now a single instance per library - allows use of loggers from any linking prog - a LOT of other things --- Source/lib/crypto/crypters/aes_cbc_crypter.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Source/lib/crypto/crypters/aes_cbc_crypter.c') diff --git a/Source/lib/crypto/crypters/aes_cbc_crypter.c b/Source/lib/crypto/crypters/aes_cbc_crypter.c index d5d0f9a60..9b7b07c62 100644 --- a/Source/lib/crypto/crypters/aes_cbc_crypter.c +++ b/Source/lib/crypto/crypters/aes_cbc_crypter.c @@ -23,7 +23,6 @@ #include "aes_cbc_crypter.h" -#include /* @@ -1385,7 +1384,7 @@ static status_t decrypt (private_aes_cbc_crypter_t *this, chunk_t data, chunk_t return INVALID_ARG; } - decrypted->ptr = allocator_alloc(data.len); + decrypted->ptr = malloc(data.len); if (decrypted->ptr == NULL) { return OUT_OF_RES; @@ -1433,7 +1432,7 @@ static status_t encrypt (private_aes_cbc_crypter_t *this, chunk_t data, chunk_t return INVALID_ARG; } - encrypted->ptr = allocator_alloc(data.len); + encrypted->ptr = malloc(data.len); if (encrypted->ptr == NULL) { return OUT_OF_RES; @@ -1579,7 +1578,7 @@ static status_t set_key (private_aes_cbc_crypter_t *this, chunk_t key) */ static void destroy (private_aes_cbc_crypter_t *this) { - allocator_free(this); + free(this); } /* @@ -1587,7 +1586,7 @@ static void destroy (private_aes_cbc_crypter_t *this) */ aes_cbc_crypter_t *aes_cbc_crypter_create(size_t key_size) { - private_aes_cbc_crypter_t *this = allocator_alloc_thing(private_aes_cbc_crypter_t); + private_aes_cbc_crypter_t *this = malloc_thing(private_aes_cbc_crypter_t); #if !defined(FIXED_TABLES) if(!tab_gen) { gen_tabs(); tab_gen = 1; } @@ -1608,7 +1607,7 @@ aes_cbc_crypter_t *aes_cbc_crypter_create(size_t key_size) this->aes_Nkey = 4; break; default: - allocator_free(this); + free(this); return NULL; } -- cgit v1.2.3