aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Source/charon/testcases/generator_test.c24
-rw-r--r--Source/charon/testcases/hasher_md5_test.c1
-rw-r--r--Source/charon/testcases/hasher_sha1_test.c3
-rw-r--r--Source/charon/testcases/hmac_test.c2
-rw-r--r--Source/charon/testcases/parser_test.c6
-rw-r--r--Source/charon/testcases/testcases.c6
6 files changed, 27 insertions, 15 deletions
diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c
index 01090f747..0d32ba137 100644
--- a/Source/charon/testcases/generator_test.c
+++ b/Source/charon/testcases/generator_test.c
@@ -70,10 +70,10 @@ void test_generator_with_header_payload(tester_t *tester)
tester->assert_true(tester,(generator->write_to_chunk(generator,&generated_data) == SUCCESS),"write_to_chunk call check");
u_int8_t expected_generation[] = {
+ 0x01,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x01,
+ 0x02,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x02,
0x03,0x20,0x06,0x28,
0x00,0x00,0x00,0x07,
0x00,0x00,0x00,0x1C,
@@ -104,14 +104,15 @@ void test_generator_with_header_payload(tester_t *tester)
tester->assert_true(tester,(generator->write_to_chunk(generator,&generated_data) == SUCCESS),"write_to_chunk call check");
u_int8_t expected_generation2[] = {
- 0x00,0x22,0x00,0x00,
- 0x54,0x23,0x12,0x34,
+ 0x34,0x12,0x23,0x54,
+ 0x00,0x00,0x22,0x00,
+ 0x98,0x23,0x12,0x00,
0x00,0x00,0x00,0x00,
- 0x00,0x12,0x23,0x98,
0xF3,0x20,0x12,0x28,
0x00,0x33,0xAF,0xF3,
0x00,0x00,0x00,0x1C,
};
+
logger->log_bytes(logger,RAW,"expected header",expected_generation2,sizeof(expected_generation2));
@@ -175,7 +176,7 @@ void test_generator_with_transform_attribute(tester_t *tester)
logger->log_chunk(logger,RAW,"generated attribute",&generated_data);
u_int8_t expected_generation2[] = {
- 0x80,0x00,0x88,0x16,
+ 0x80,0x00,0x16,0x88,
};
tester->assert_true(tester,(memcmp(expected_generation2,generated_data.ptr,sizeof(expected_generation2)) == 0), "compare generated data");
@@ -574,10 +575,10 @@ void test_generator_with_sa_payload(tester_t *tester)
u_int8_t expected_generation[] = {
/* sa payload header */
- 0x00,0x22,0x00,0x00,
- 0x54,0x23,0x12,0x34,
+ 0x34,0x12,0x23,0x54,
+ 0x00,0x00,0x22,0x00,
+ 0x98,0x23,0x12,0x00,
0x00,0x00,0x00,0x00,
- 0x00,0x12,0x23,0x98,
0x21,0x20,0x12,0x28,
0x00,0x33,0xAF,0xF3,
0x00,0x00,0x00,0x60,
@@ -763,7 +764,7 @@ void test_generator_with_nonce_payload(tester_t *tester)
nonce_payload = nonce_payload_create();
- nonce.ptr = allocator_clone_bytes("1234567890123456", strlen("1234567890123456"));
+ nonce.ptr = "1234567890123456";
nonce.len = strlen("1234567890123456");
nonce_payload->set_nonce(nonce_payload,nonce);
@@ -788,7 +789,8 @@ void test_generator_with_nonce_payload(tester_t *tester)
tester->assert_true(tester,(memcmp(expected_generation,generated_data.ptr,sizeof(expected_generation)) == 0), "compare generated data");
- allocator_free_chunk(generated_data);
+ allocator_free_chunk(generated_data);
+
tester->assert_true(tester,(nonce_payload->destroy(nonce_payload) == SUCCESS), "notify_payload destroy call check");
tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check");
diff --git a/Source/charon/testcases/hasher_md5_test.c b/Source/charon/testcases/hasher_md5_test.c
index f1402ad54..a3fede755 100644
--- a/Source/charon/testcases/hasher_md5_test.c
+++ b/Source/charon/testcases/hasher_md5_test.c
@@ -90,4 +90,5 @@ void test_hasher_md5(tester_t *tester)
tester->assert_true(tester, hash_chunk.len == 16, "hash len");
tester->assert_false(tester, memcmp(hash_chunk.ptr, hash_abcd, hash_chunk.len), "hash for abcd...");
allocator_free(hash_chunk.ptr);
+ tester->assert_true(tester, (hasher->destroy(hasher) == SUCCESS), "destroy call test");
}
diff --git a/Source/charon/testcases/hasher_sha1_test.c b/Source/charon/testcases/hasher_sha1_test.c
index 7f4667847..79b9a1d4f 100644
--- a/Source/charon/testcases/hasher_sha1_test.c
+++ b/Source/charon/testcases/hasher_sha1_test.c
@@ -100,4 +100,7 @@ void test_hasher_sha1(tester_t *tester)
}
}
tester->assert_false(tester, memcmp(hash_buffer, hash_aaa, 20), "hash for aaa...");
+
+
+ tester->assert_true(tester, (hasher->destroy(hasher) == SUCCESS), "destroy call test");
}
diff --git a/Source/charon/testcases/hmac_test.c b/Source/charon/testcases/hmac_test.c
index 8bb75d563..30f6df331 100644
--- a/Source/charon/testcases/hmac_test.c
+++ b/Source/charon/testcases/hmac_test.c
@@ -216,6 +216,7 @@ void test_hmac_sha1(tester_t *tester)
tester->assert_true(tester, digest[3].len == 20, "chunk len append mode");
tester->assert_false(tester, memcmp(digest[3].ptr, reference[3].ptr, 20), "hmac value append mode");
+ allocator_free(digest[3].ptr);
}
/*
@@ -404,4 +405,5 @@ void test_hmac_md5(tester_t *tester)
tester->assert_true(tester, digest[3].len == 16, "chunk len append mode");
tester->assert_false(tester, memcmp(digest[3].ptr, reference[3].ptr, 16), "hmac value append mode");
+ allocator_free(digest[3].ptr);
}
diff --git a/Source/charon/testcases/parser_test.c b/Source/charon/testcases/parser_test.c
index 85705a1f3..5ef5e5bf7 100644
--- a/Source/charon/testcases/parser_test.c
+++ b/Source/charon/testcases/parser_test.c
@@ -49,10 +49,10 @@ void test_parser_with_header_payload(tester_t *tester)
chunk_t header_chunk;
u_int8_t header_bytes[] = {
+ 0x01,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x01,
+ 0x02,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x02,
0x03,0x45,0x06,0x28,
0x00,0x00,0x00,0x07,
0x00,0x00,0x00,0x1C,
@@ -219,7 +219,7 @@ void test_parser_with_nonce_payload(tester_t *tester)
tester->assert_true(tester,(result.len == 16), "parsed nonce lenght");
tester->assert_false(tester,(memcmp(nonce_bytes + 4, result.ptr, result.len)), "parsed nonce data");
nonce_payload->destroy(nonce_payload);
-
+ allocator_free_chunk(result);
}
/*
diff --git a/Source/charon/testcases/testcases.c b/Source/charon/testcases/testcases.c
index 9574632ac..937f2f05d 100644
--- a/Source/charon/testcases/testcases.c
+++ b/Source/charon/testcases/testcases.c
@@ -294,13 +294,17 @@ logger_manager_t *global_logger_manager;
tester->perform_tests(tester,all_tests);
- //tester->perform_test(tester,&hmac_test2);
+// tester->perform_test(tester,&hasher_sha1_test);
tester->destroy(tester);
+ /* Destroy objects*/
+ global_configuration_manager->destroy(global_configuration_manager);
+ global_ike_sa_manager->destroy(global_ike_sa_manager);
+
/* Destroy all queues */
global_job_queue->destroy(global_job_queue);
global_event_queue->destroy(global_event_queue);
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-19 21:58:20 +0000