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/testing/aes_cbc_crypter_test.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'Source/testing/aes_cbc_crypter_test.c') diff --git a/Source/testing/aes_cbc_crypter_test.c b/Source/testing/aes_cbc_crypter_test.c index 1ea2983cd..30dae3926 100644 --- a/Source/testing/aes_cbc_crypter_test.c +++ b/Source/testing/aes_cbc_crypter_test.c @@ -24,7 +24,6 @@ #include "aes_cbc_crypter_test.h" -#include #include void test_aes_cbc_crypter(protected_tester_t *tester) @@ -53,7 +52,7 @@ void test_aes_cbc_crypter(protected_tester_t *tester) chunk_t decrypted1; logger_t *logger; - logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER); + logger = logger_manager->get_logger(logger_manager,TESTER); crypter = (crypter_t *) aes_cbc_crypter_create(16); tester->assert_true(tester, (crypter != NULL), "create call test"); @@ -68,14 +67,14 @@ void test_aes_cbc_crypter(protected_tester_t *tester) logger->log_chunk(logger,RAW,"encrypted :", encrypted1); tester->assert_true(tester, (crypter->decrypt(crypter,encrypted1,iv1_chunk,&decrypted1) == SUCCESS), "decrypt call test"); - allocator_free_chunk(&encrypted1); + chunk_free(&encrypted1); tester->assert_true(tester, (memcmp(decrypted1.ptr, plaintext1, 16) == 0), "decrypted value"); logger->log_chunk(logger,RAW,"expected decrypted :", data1); logger->log_chunk(logger,RAW,"decrypted :", decrypted1); - allocator_free_chunk(&decrypted1); + chunk_free(&decrypted1); crypter->destroy(crypter); @@ -123,14 +122,14 @@ void test_aes_cbc_crypter(protected_tester_t *tester) logger->log_chunk(logger,RAW,"encrypted :", encrypted2); tester->assert_true(tester, (crypter->decrypt(crypter,encrypted2,iv2_chunk,&decrypted2) == SUCCESS), "decrypt call test"); - allocator_free_chunk(&encrypted2); + chunk_free(&encrypted2); tester->assert_true(tester, (memcmp(decrypted2.ptr, plaintext2, 32) == 0), "decrypted value"); logger->log_chunk(logger,RAW,"expected decrypted :", data2); logger->log_chunk(logger,RAW,"decrypted :", decrypted2); - allocator_free_chunk(&decrypted2); + chunk_free(&decrypted2); crypter->destroy(crypter); @@ -188,14 +187,14 @@ void test_aes_cbc_crypter(protected_tester_t *tester) logger->log_chunk(logger,RAW,"encrypted :", encrypted3); tester->assert_true(tester, (crypter->decrypt(crypter,encrypted3,iv3_chunk,&decrypted3) == SUCCESS), "decrypt call test"); - allocator_free_chunk(&encrypted3); + chunk_free(&encrypted3); tester->assert_true(tester, (memcmp(decrypted3.ptr, plaintext3, 64) == 0), "decrypted value"); logger->log_chunk(logger,RAW,"expected decrypted :", data3); logger->log_chunk(logger,RAW,"decrypted :", decrypted3); - allocator_free_chunk(&decrypted3); + chunk_free(&decrypted3); crypter->destroy(crypter); } -- cgit v1.2.3