diff options
author | Martin Willi <martin@strongswan.org> | 2006-03-16 15:25:06 +0000 |
---|---|---|
committer | Martin Willi <martin@strongswan.org> | 2006-03-16 15:25:06 +0000 |
commit | 16b9a73cc4bd4c4fafc8618fdd4c05ab72195df1 (patch) | |
tree | b7d3214d59942dbd75ad8b9b8f86468f82f7a496 /Source/charon/testcases | |
parent | b1953ccd05b5e6cf5a87c557208d5f8a1fcad231 (diff) | |
download | strongswan-16b9a73cc4bd4c4fafc8618fdd4c05ab72195df1.tar.bz2 strongswan-16b9a73cc4bd4c4fafc8618fdd4c05ab72195df1.tar.xz |
- reworked configuration framework completly
- configuration is now split up in: connections, policies, credentials and daemon config
- further alloc/free fixes needed!
Diffstat (limited to 'Source/charon/testcases')
18 files changed, 125 insertions, 122 deletions
diff --git a/Source/charon/testcases/Makefile.testcases b/Source/charon/testcases/Makefile.testcases index e21b5c258..366bf744f 100644 --- a/Source/charon/testcases/Makefile.testcases +++ b/Source/charon/testcases/Makefile.testcases @@ -108,12 +108,12 @@ TEST_OBJS+= $(BUILD_DIR)encryption_payload_test.o $(BUILD_DIR)encryption_payload_test.o : $(TESTCASES_DIR)encryption_payload_test.c $(TESTCASES_DIR)encryption_payload_test.h $(CC) $(CFLAGS) -c -o $@ $< -TEST_OBJS+= $(BUILD_DIR)init_config_test.o -$(BUILD_DIR)init_config_test.o : $(TESTCASES_DIR)init_config_test.c $(TESTCASES_DIR)init_config_test.h +TEST_OBJS+= $(BUILD_DIR)connection_test.o +$(BUILD_DIR)connection_test.o : $(TESTCASES_DIR)connection_test.c $(TESTCASES_DIR)connection_test.h $(CC) $(CFLAGS) -c -o $@ $< -TEST_OBJS+= $(BUILD_DIR)sa_config_test.o -$(BUILD_DIR)sa_config_test.o : $(TESTCASES_DIR)sa_config_test.c $(TESTCASES_DIR)sa_config_test.h +TEST_OBJS+= $(BUILD_DIR)policy_test.o +$(BUILD_DIR)policy_test.o : $(TESTCASES_DIR)policy_test.c $(TESTCASES_DIR)policy_test.h $(CC) $(CFLAGS) -c -o $@ $< TEST_OBJS+= $(BUILD_DIR)proposal_test.o diff --git a/Source/charon/testcases/aes_cbc_crypter_test.c b/Source/charon/testcases/aes_cbc_crypter_test.c index e92be7fc9..3208e847b 100644 --- a/Source/charon/testcases/aes_cbc_crypter_test.c +++ b/Source/charon/testcases/aes_cbc_crypter_test.c @@ -64,16 +64,16 @@ void test_aes_cbc_crypter(protected_tester_t *tester) tester->assert_true(tester, (memcmp(encrypted1.ptr, expected_encrypted1.ptr, 16) == 0), "Encrypted value"); - logger->log_chunk(logger,RAW,"exptected encrypted :", &expected_encrypted1); - logger->log_chunk(logger,RAW,"encrypted :", &encrypted1); + logger->log_chunk(logger,RAW,"exptected encrypted :", expected_encrypted1); + 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); 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); + logger->log_chunk(logger,RAW,"expected decrypted :", data1); + logger->log_chunk(logger,RAW,"decrypted :", decrypted1); allocator_free_chunk(&decrypted1); @@ -119,16 +119,16 @@ void test_aes_cbc_crypter(protected_tester_t *tester) tester->assert_true(tester, (memcmp(encrypted2.ptr, expected_encrypted2.ptr, 32) == 0), "Encrypted value"); - logger->log_chunk(logger,RAW,"exptected encrypted :", &expected_encrypted2); - logger->log_chunk(logger,RAW,"encrypted :", &encrypted2); + logger->log_chunk(logger,RAW,"exptected encrypted :", expected_encrypted2); + 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); 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); + logger->log_chunk(logger,RAW,"expected decrypted :", data2); + logger->log_chunk(logger,RAW,"decrypted :", decrypted2); allocator_free_chunk(&decrypted2); @@ -184,16 +184,16 @@ void test_aes_cbc_crypter(protected_tester_t *tester) tester->assert_true(tester, (memcmp(encrypted3.ptr, expected_encrypted3.ptr, 64) == 0), "Encrypted value"); - logger->log_chunk(logger,RAW,"exptected encrypted :", &expected_encrypted3); - logger->log_chunk(logger,RAW,"encrypted :", &encrypted3); + logger->log_chunk(logger,RAW,"exptected encrypted :", expected_encrypted3); + 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); 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); + logger->log_chunk(logger,RAW,"expected decrypted :", data3); + logger->log_chunk(logger,RAW,"decrypted :", decrypted3); allocator_free_chunk(&decrypted3); diff --git a/Source/charon/testcases/aes_cbc_crypter_test.h b/Source/charon/testcases/aes_cbc_crypter_test.h index adedd7f97..611863636 100644 --- a/Source/charon/testcases/aes_cbc_crypter_test.h +++ b/Source/charon/testcases/aes_cbc_crypter_test.h @@ -20,8 +20,8 @@ * for more details. */ -#ifndef _AES_CBC_CRYPTER_TEST_H_ -#define _AES_CBC_CRYPTER_TEST_H_ +#ifndef AES_CBC_CRYPTER_TEST_H_ +#define AES_CBC_CRYPTER_TEST_H_ #include <transforms/crypters/aes_cbc_crypter.h> #include <utils/tester.h> @@ -35,4 +35,4 @@ */ void test_aes_cbc_crypter(protected_tester_t *tester); -#endif //_AES_CBC_CRYPTER_TEST_H_ +#endif /* AES_CBC_CRYPTER_TEST_H_ */ diff --git a/Source/charon/testcases/child_sa_test.h b/Source/charon/testcases/child_sa_test.h index 00e4db163..ef92499fe 100644 --- a/Source/charon/testcases/child_sa_test.h +++ b/Source/charon/testcases/child_sa_test.h @@ -35,7 +35,7 @@ */ void test_child_sa(protected_tester_t *tester); -#endif //CHILD_SA_TEST_H_ +#endif /* CHILD_SA_TEST_H_ */ diff --git a/Source/charon/testcases/init_config_test.c b/Source/charon/testcases/connection_test.c index bd2721b3d..204534b24 100644 --- a/Source/charon/testcases/init_config_test.c +++ b/Source/charon/testcases/connection_test.c @@ -1,7 +1,7 @@ /** - * @file init_config_test.c + * @file connection_test.c * - * @brief Tests for the init_config_t class. + * @brief Tests for the connection_t class. * */ @@ -20,23 +20,25 @@ * for more details. */ -#include "init_config_test.h" +#include "connection_test.h" -#include <config/init_config.h> +#include <config/connection.h> #include <utils/allocator.h> +#include <transforms/prfs/prf.h> /** * Described in header. */ -void test_init_config(protected_tester_t *tester) +void test_connection(protected_tester_t *tester) { host_t *alice = host_create(AF_INET, "192.168.0.1", 500); host_t *bob = host_create(AF_INET, "192.168.0.2", 500); - init_config_t *init_config = init_config_create(alice, bob); - proposal_t *prop1, *prop2, *prop3, *prop4;//, *selected_one; + identification_t *alice_id = identification_create_from_string(AF_INET, "192.168.0.1"); + identification_t *bob_id = identification_create_from_string(AF_INET, "192.168.0.2"); + connection_t *connection = connection_create(alice, bob, alice_id, bob_id, RSA_DIGITAL_SIGNATURE); + proposal_t *prop1, *prop2, *prop3, *prop4; linked_list_t *list; - //status_t status; prop1 = proposal_create(1); prop1->add_algorithm(prop1, IKE, ENCRYPTION_ALGORITHM, ENCR_AES_CBC, 20); @@ -62,12 +64,12 @@ void test_init_config(protected_tester_t *tester) prop4->add_algorithm(prop4, IKE, PSEUDO_RANDOM_FUNCTION, PRF_HMAC_TIGER, 20); prop4->add_algorithm(prop4, IKE, DIFFIE_HELLMAN_GROUP, MODP_768_BIT, 0); - init_config->add_proposal(init_config, prop1); - init_config->add_proposal(init_config, prop2); - init_config->add_proposal(init_config, prop3); - init_config->add_proposal(init_config, prop4); + connection->add_proposal(connection, prop1); + connection->add_proposal(connection, prop2); + connection->add_proposal(connection, prop3); + connection->add_proposal(connection, prop4); - list = init_config->get_proposals(init_config); + list = connection->get_proposals(connection); tester->assert_true(tester,(list->get_count(list) == 4), "proposal count check "); @@ -77,5 +79,5 @@ void test_init_config(protected_tester_t *tester) list->destroy(list); - init_config->destroy(init_config); + connection->destroy(connection); } diff --git a/Source/charon/testcases/init_config_test.h b/Source/charon/testcases/connection_test.h index 2d171de46..4d2a1d89e 100644 --- a/Source/charon/testcases/init_config_test.h +++ b/Source/charon/testcases/connection_test.h @@ -1,7 +1,7 @@ /** - * @file init_config_test.h + * @file connection_test.h * - * @brief Tests for the init_config_t class. + * @brief Tests for the connection_t class. * */ @@ -21,18 +21,18 @@ */ -#ifndef _INIT_CONFIG_TEST_H_ -#define _INIT_CONFIG_TEST_H_ +#ifndef INIT_CONFIG_TEST_H_ +#define INIT_CONFIG_TEST_H_ #include <utils/tester.h> /** - * @brief Test function used to test the init_config_t functionality. + * @brief Test function used to test the connection_t functionality. * * @param tester associated protected_tester_t object * * @ingroup testcases */ -void test_init_config(protected_tester_t *tester); +void test_connection(protected_tester_t *tester); -#endif //_INIT_CONFIG_TEST_H_ +#endif /* INIT_CONFIG_TEST_H_ */ diff --git a/Source/charon/testcases/diffie_hellman_test.c b/Source/charon/testcases/diffie_hellman_test.c index d07f2fc3b..e1e54af41 100644 --- a/Source/charon/testcases/diffie_hellman_test.c +++ b/Source/charon/testcases/diffie_hellman_test.c @@ -49,10 +49,10 @@ void test_diffie_hellman(protected_tester_t *tester) tester->assert_true(tester,(other_diffie_hellman != NULL), "create call check"); my_diffie_hellman->get_my_public_value(my_diffie_hellman,&my_public_value); - logger->log_chunk(logger,RAW,"My public value",&my_public_value); + logger->log_chunk(logger,RAW,"My public value",my_public_value); other_diffie_hellman->get_my_public_value(other_diffie_hellman,&other_public_value); - logger->log_chunk(logger,RAW,"Other public value",&other_public_value); + logger->log_chunk(logger,RAW,"Other public value",other_public_value); my_diffie_hellman->set_other_public_value(my_diffie_hellman,other_public_value); other_diffie_hellman->set_other_public_value(other_diffie_hellman,my_public_value); @@ -61,10 +61,10 @@ void test_diffie_hellman(protected_tester_t *tester) allocator_free(other_public_value.ptr); tester->assert_true(tester,( my_diffie_hellman->get_shared_secret(my_diffie_hellman,&my_secret) == SUCCESS), "get_shared_secret call check"); - logger->log_chunk(logger,RAW,"My shared secret",&my_secret); + logger->log_chunk(logger,RAW,"My shared secret",my_secret); tester->assert_true(tester,( other_diffie_hellman->get_shared_secret(other_diffie_hellman,&other_secret) == SUCCESS), "get_shared_secret call check"); - logger->log_chunk(logger,RAW,"Other shared secret",&other_secret); + logger->log_chunk(logger,RAW,"Other shared secret",other_secret); tester->assert_true(tester,( memcmp(my_secret.ptr,other_secret.ptr,other_secret.len) == 0), "shared secret same value check"); diff --git a/Source/charon/testcases/encryption_payload_test.c b/Source/charon/testcases/encryption_payload_test.c index 970472d2e..8f6a0c5c7 100644 --- a/Source/charon/testcases/encryption_payload_test.c +++ b/Source/charon/testcases/encryption_payload_test.c @@ -65,7 +65,7 @@ void test_encryption_payload(protected_tester_t *tester) nonce.ptr = "test text und so..."; nonce.len = strlen(nonce.ptr) +1; - logger->log_chunk(logger, RAW, "nonce", &nonce); + logger->log_chunk(logger, RAW, "nonce", nonce); encryption_payload = encryption_payload_create(); nonce_payload = nonce_payload_create(); @@ -92,10 +92,10 @@ void test_encryption_payload(protected_tester_t *tester) generator->generate_payload(generator, (payload_t*)encryption_payload); generator->write_to_chunk(generator, &data); - logger->log_chunk(logger, RAW, "generated data", &data); + logger->log_chunk(logger, RAW, "generated data", data); encryption_payload->build_signature(encryption_payload, data); - logger->log_chunk(logger, RAW, "generated data", &data); + logger->log_chunk(logger, RAW, "generated data", data); encryption_payload->destroy(encryption_payload); @@ -126,7 +126,7 @@ void test_encryption_payload(protected_tester_t *tester) tester->assert_true(tester, (got_nonce.len == nonce.len), "decrypted nonce"); tester->assert_false(tester, memcmp(nonce.ptr, got_nonce.ptr, nonce.len), "decrypted nonce"); - logger->log_chunk(logger, RAW, "nonce", &got_nonce); + logger->log_chunk(logger, RAW, "nonce", got_nonce); allocator_free(data.ptr); allocator_free(got_nonce.ptr); diff --git a/Source/charon/testcases/event_queue_test.c b/Source/charon/testcases/event_queue_test.c index 9d8ed56ba..5366dca07 100644 --- a/Source/charon/testcases/event_queue_test.c +++ b/Source/charon/testcases/event_queue_test.c @@ -71,6 +71,7 @@ static void event_queue_insert_thread(event_queue_test_t * testinfos) timeval_t time; job_t * job; int i,j; + connection_t *connection; gettimeofday(¤t_time,NULL); for (i = 0; i < testinfos->insert_times_count;i++) @@ -78,7 +79,7 @@ static void event_queue_insert_thread(event_queue_test_t * testinfos) for (j = 0; j < testinfos->entries_per_time;j++) { - job = (job_t *) initiate_ike_sa_job_create("testvalue"); + job = (job_t *) initiate_ike_sa_job_create(connection); time.tv_usec = 0; time.tv_sec = current_time.tv_sec + i; diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c index e1a1dc1a6..e23540112 100644 --- a/Source/charon/testcases/generator_test.c +++ b/Source/charon/testcases/generator_test.c @@ -88,7 +88,7 @@ void test_generator_with_header_payload(protected_tester_t *tester) logger->log_bytes(logger,RAW,"expected header",expected_generation,sizeof(expected_generation)); tester->assert_true(tester,(generated_data.len == sizeof(expected_generation)), "compare generated data length"); - logger->log_chunk(logger,RAW,"generated header",&generated_data); + logger->log_chunk(logger,RAW,"generated header",generated_data); tester->assert_true(tester,(memcmp(expected_generation,generated_data.ptr,sizeof(expected_generation)) == 0), "compare generated data 1"); allocator_free_chunk(&generated_data); @@ -122,7 +122,7 @@ void test_generator_with_header_payload(protected_tester_t *tester) logger->log_bytes(logger,RAW,"expected header",expected_generation2,sizeof(expected_generation2)); - logger->log_chunk(logger,RAW,"generated header",&generated_data); + logger->log_chunk(logger,RAW,"generated header",generated_data); tester->assert_true(tester,(memcmp(expected_generation2,generated_data.ptr,sizeof(expected_generation2)) == 0), "compare generated data 2"); allocator_free_chunk(&generated_data); @@ -152,7 +152,7 @@ void test_generator_with_transform_attribute(protected_tester_t *tester) attribute = transform_attribute_create(); generator->generate_payload(generator,(payload_t *)attribute); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated attribute",&generated_data); + logger->log_chunk(logger,RAW,"generated attribute",generated_data); u_int8_t expected_generation[] = { 0x80,0x00,0x00,0x00, @@ -176,7 +176,7 @@ void test_generator_with_transform_attribute(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)attribute); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated attribute",&generated_data); + logger->log_chunk(logger,RAW,"generated attribute",generated_data); u_int8_t expected_generation2[] = { 0x80,0x00,0x16,0x88, @@ -205,7 +205,7 @@ void test_generator_with_transform_attribute(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)attribute); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated attribute",&generated_data); + logger->log_chunk(logger,RAW,"generated attribute",generated_data); u_int8_t expected_generation3[] = { 0x01,0xC8,0x00,0x19, @@ -278,7 +278,7 @@ void test_generator_with_transform_substructure(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)transform); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated transform",&generated_data); + logger->log_chunk(logger,RAW,"generated transform",generated_data); u_int8_t expected_generation3[] = { 0x00,0x00,0x00,0x18, @@ -378,7 +378,7 @@ void test_generator_with_proposal_substructure(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)proposal); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated transform",&generated_data); + logger->log_chunk(logger,RAW,"generated transform",generated_data); u_int8_t expected_generation[] = { /* proposal header */ @@ -523,7 +523,7 @@ void test_generator_with_sa_payload(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)ike_header); generator->generate_payload(generator,(payload_t *)sa_payload); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated transform",&generated_data); + logger->log_chunk(logger,RAW,"generated transform",generated_data); u_int8_t expected_generation[] = { /* sa payload header */ @@ -599,7 +599,7 @@ void test_generator_with_sa_payload(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)sa_payload); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated",&generated_data); + logger->log_chunk(logger,RAW,"generated",generated_data); u_int8_t expected_generation2[] = { 0x00,0x00,0x00,0x6C, /* payload header*/ @@ -681,7 +681,7 @@ void test_generator_with_sa_payload(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)sa_payload); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated",&generated_data); + logger->log_chunk(logger,RAW,"generated",generated_data); u_int8_t expected_generation3[] = { 0x00,0x00,0x00,0xA0, /* payload header*/ @@ -790,7 +790,7 @@ void test_generator_with_ke_payload(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)ke_payload); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated payload",&generated_data); + logger->log_chunk(logger,RAW,"generated payload",generated_data); u_int8_t expected_generation[] = { /* payload header */ @@ -849,7 +849,7 @@ void test_generator_with_notify_payload(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)notify_payload); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated payload",&generated_data); + logger->log_chunk(logger,RAW,"generated payload",generated_data); u_int8_t expected_generation[] = { /* payload header */ @@ -903,7 +903,7 @@ void test_generator_with_nonce_payload(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)nonce_payload); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated payload",&generated_data); + logger->log_chunk(logger,RAW,"generated payload",generated_data); u_int8_t expected_generation[] = { @@ -958,7 +958,7 @@ void test_generator_with_id_payload(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)id_payload); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated payload",&generated_data); + logger->log_chunk(logger,RAW,"generated payload",generated_data); u_int8_t expected_generation[] = { @@ -1011,7 +1011,7 @@ void test_generator_with_auth_payload(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)auth_payload); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated payload",&generated_data); + logger->log_chunk(logger,RAW,"generated payload",generated_data); u_int8_t expected_generation[] = { @@ -1087,7 +1087,7 @@ void test_generator_with_ts_payload(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)ts_payload); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated payload",&generated_data); + logger->log_chunk(logger,RAW,"generated payload",generated_data); u_int8_t expected_generation[] = { @@ -1148,7 +1148,7 @@ void test_generator_with_cert_payload(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)cert_payload); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated payload",&generated_data); + logger->log_chunk(logger,RAW,"generated payload",generated_data); u_int8_t expected_generation[] = { /* payload header */ @@ -1200,7 +1200,7 @@ void test_generator_with_certreq_payload(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)certreq_payload); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated payload",&generated_data); + logger->log_chunk(logger,RAW,"generated payload",generated_data); u_int8_t expected_generation[] = { /* payload header */ @@ -1254,7 +1254,7 @@ void test_generator_with_delete_payload(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)delete_payload); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated payload",&generated_data); + logger->log_chunk(logger,RAW,"generated payload",generated_data); u_int8_t expected_generation[] = { /* payload header */ @@ -1304,7 +1304,7 @@ void test_generator_with_vendor_id_payload(protected_tester_t *tester) vendor_id_payload->set_data(vendor_id_payload,data); generator->generate_payload(generator,(payload_t *)vendor_id_payload); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated payload",&generated_data); + logger->log_chunk(logger,RAW,"generated payload",generated_data); u_int8_t expected_generation[] = { /* payload header */ @@ -1375,7 +1375,7 @@ void test_generator_with_cp_payload(protected_tester_t *tester) generator->generate_payload(generator,(payload_t *)configuration); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated configuration",&generated_data); + logger->log_chunk(logger,RAW,"generated configuration",generated_data); u_int8_t expected_generation3[] = { /* cp payload header */ @@ -1427,7 +1427,7 @@ void test_generator_with_eap_payload(protected_tester_t *tester) eap_payload->set_message(eap_payload,message); generator->generate_payload(generator,(payload_t *)eap_payload); generator->write_to_chunk(generator,&generated_data); - logger->log_chunk(logger,RAW,"generated payload",&generated_data); + logger->log_chunk(logger,RAW,"generated payload",generated_data); u_int8_t expected_generation[] = { /* payload header */ diff --git a/Source/charon/testcases/hmac_signer_test.c b/Source/charon/testcases/hmac_signer_test.c index 59f2f1e9b..e5c4bac43 100644 --- a/Source/charon/testcases/hmac_signer_test.c +++ b/Source/charon/testcases/hmac_signer_test.c @@ -96,8 +96,8 @@ void test_hmac_md5_signer(protected_tester_t *tester) signer->allocate_signature(signer, data[i], &signature[i]); tester->assert_true(tester, signature[i].len == 12, "chunk len"); tester->assert_true(tester, (memcmp(signature[i].ptr, reference[i].ptr, 12) == 0), "hmac value"); - logger->log_chunk(logger,RAW,"expected signature:",&reference[i]); - logger->log_chunk(logger,RAW,"signature:",&signature[i]); + logger->log_chunk(logger,RAW,"expected signature:",reference[i]); + logger->log_chunk(logger,RAW,"signature:",signature[i]); allocator_free(signature[i].ptr); valid = signer->verify_signature(signer, data[i],reference[i]); tester->assert_true(tester, (valid == TRUE), "Signature valid check"); @@ -194,8 +194,8 @@ void test_hmac_sha1_signer(protected_tester_t *tester) signer->allocate_signature(signer, data[i], &signature[i]); tester->assert_true(tester, signature[i].len == 12, "chunk len"); tester->assert_true(tester, (memcmp(signature[i].ptr, reference[i].ptr, 12) == 0), "hmac value"); - logger->log_chunk(logger,RAW,"expected signature:",&reference[i]); - logger->log_chunk(logger,RAW,"signature:",&signature[i]); + logger->log_chunk(logger,RAW,"expected signature:",reference[i]); + logger->log_chunk(logger,RAW,"signature:",signature[i]); allocator_free(signature[i].ptr); valid = signer->verify_signature(signer, data[i],reference[i]); tester->assert_true(tester, (valid == TRUE), "Signature valid check"); diff --git a/Source/charon/testcases/hmac_signer_test.h b/Source/charon/testcases/hmac_signer_test.h index 681fa4d71..4a2459a8e 100644 --- a/Source/charon/testcases/hmac_signer_test.h +++ b/Source/charon/testcases/hmac_signer_test.h @@ -20,8 +20,8 @@ * for more details. */ -#ifndef _HMAC_SIGNER_TEST_H_ -#define _HMAC_SIGNER_TEST_H_ +#ifndef HMAC_SIGNER_TEST_H_ +#define HMAC_SIGNER_TEST_H_ #include <utils/tester.h> @@ -43,4 +43,4 @@ void test_hmac_md5_signer(protected_tester_t *tester); */ void test_hmac_sha1_signer(protected_tester_t *tester); -#endif //_HMAC_SIGNER_TEST_H_ +#endif /* HMAC_SIGNER_TEST_H_ */ diff --git a/Source/charon/testcases/job_queue_test.c b/Source/charon/testcases/job_queue_test.c index 017408da0..e7c93b68c 100644 --- a/Source/charon/testcases/job_queue_test.c +++ b/Source/charon/testcases/job_queue_test.c @@ -62,7 +62,7 @@ static void test_job_queue_sender(job_queue_test_t * testinfo) int i; for (i = 0; i < testinfo->insert_item_count; i++) { - job_t *job = (job_t *) initiate_ike_sa_job_create("test"); + job_t *job = (job_t *) initiate_ike_sa_job_create(NULL); testinfo->job_queue->add(testinfo->job_queue,job); } } diff --git a/Source/charon/testcases/sa_config_test.c b/Source/charon/testcases/policy_test.c index bb01618df..d02c419f0 100644 --- a/Source/charon/testcases/sa_config_test.c +++ b/Source/charon/testcases/policy_test.c @@ -1,7 +1,7 @@ /** - * @file sa_config_test.c + * @file policy_test.c * - * @brief Tests for the sa_config_t class. + * @brief Tests for the policy_t class. * */ @@ -20,10 +20,10 @@ * for more details. */ -#include "sa_config_test.h" +#include "policy_test.h" #include <daemon.h> -#include <config/sa_config.h> +#include <config/policy.h> #include <config/traffic_selector.h> #include <utils/allocator.h> #include <utils/logger.h> @@ -33,25 +33,25 @@ /** * Described in header. */ -void test_sa_config(protected_tester_t *tester) +void test_policy(protected_tester_t *tester) { - sa_config_t *sa_config; + policy_t *policy; // traffic_selector_t *ts; // linked_list_t *ts_stored, *ts_supplied, *ts_selected, *ts_expected; proposal_t *proposal1, *proposal2, *proposal3, *proposal_sel; linked_list_t *proposals_list; iterator_t *iterator; logger_t *logger; + identification_t *alice, *bob; logger = charon->logger_manager->create_logger(charon->logger_manager, TESTER, NULL); logger->disable_level(logger, FULL); - sa_config = sa_config_create(ID_IPV4_ADDR, "152.96.193.130", - ID_IPV4_ADDR, "152.96.193.131", - RSA_DIGITAL_SIGNATURE, - 30000); + alice = identification_create_from_string(ID_IPV4_ADDR, "152.96.193.131"); + bob = identification_create_from_string(ID_IPV4_ADDR, "152.96.193.130"); + policy = policy_create(alice, bob); - tester->assert_true(tester, (sa_config != NULL), "sa_config construction"); + tester->assert_true(tester, (policy != NULL), "policy construction"); /* @@ -73,12 +73,12 @@ void test_sa_config(protected_tester_t *tester) proposal3->add_algorithm(proposal3, AH, INTEGRITY_ALGORITHM, AUTH_HMAC_MD5_96, 20); - sa_config->add_proposal(sa_config, proposal1); - sa_config->add_proposal(sa_config, proposal2); - sa_config->add_proposal(sa_config, proposal3); + policy->add_proposal(policy, proposal1); + policy->add_proposal(policy, proposal2); + policy->add_proposal(policy, proposal3); - proposals_list = sa_config->get_proposals(sa_config); + proposals_list = policy->get_proposals(policy); tester->assert_true(tester, (proposals_list->get_count(proposals_list) == 3), "proposal count"); @@ -95,7 +95,7 @@ void test_sa_config(protected_tester_t *tester) proposals_list->insert_last(proposals_list, proposal1); proposals_list->insert_last(proposals_list, proposal2); - proposal_sel = sa_config->select_proposal(sa_config, proposals_list); + proposal_sel = policy->select_proposal(policy, proposals_list); tester->assert_false(tester, proposal_sel == NULL, "proposal select"); /* check ESP encryption algo */ iterator = proposal_sel->create_algorithm_iterator(proposal_sel, ESP, ENCRYPTION_ALGORITHM); @@ -164,18 +164,18 @@ void test_sa_config(protected_tester_t *tester) // /* icmp request, should be discarded */ // ts_request[3] = traffic_selector_create_from_string(1, TS_IPV4_ADDR_RANGE, "0.0.0.0", 0, "255.255.255.255", 65535); // -// sa_config->add_my_traffic_selector(sa_config, ts_policy[0]); -// sa_config->add_my_traffic_selector(sa_config, ts_policy[1]); -// sa_config->add_my_traffic_selector(sa_config, ts_policy[2]); +// policy->add_my_traffic_selector(policy, ts_policy[0]); +// policy->add_my_traffic_selector(policy, ts_policy[1]); +// policy->add_my_traffic_selector(policy, ts_policy[2]); // -// count = sa_config->get_my_traffic_selectors(sa_config, &ts_result); +// count = policy->get_my_traffic_selectors(policy, &ts_result); // tester->assert_true(tester, (count == 3), "ts get count"); // ts_result[0]->destroy(ts_result[0]); // ts_result[0]->destroy(ts_result[1]); // ts_result[0]->destroy(ts_result[2]); // allocator_free(ts_result); // -// count = sa_config->select_my_traffic_selectors(sa_config, &ts_request[0], 4, &ts_result); +// count = policy->select_my_traffic_selectors(policy, &ts_request[0], 4, &ts_result); // tester->assert_true(tester, (count == 3), "ts select count"); // // @@ -207,10 +207,10 @@ void test_sa_config(protected_tester_t *tester) // u_int16_t tp_ref = ts_reference[i]->get_to_port(ts_reference[i]); // // -// logger->log_chunk(logger, RAW, "from address result", &fa_res); -// logger->log_chunk(logger, RAW, "from address reference", &fa_ref); -// logger->log_chunk(logger, RAW, "to address result", &ta_res); -// logger->log_chunk(logger, RAW, "to address reference", &ta_ref); +// logger->log_chunk(logger, RAW, "from address result", fa_res); +// logger->log_chunk(logger, RAW, "from address reference", fa_ref); +// logger->log_chunk(logger, RAW, "to address result", ta_res); +// logger->log_chunk(logger, RAW, "to address reference", ta_ref); // tester->assert_true(tester, fa_res.len == fa_ref.len, "from address len"); // tester->assert_false(tester, memcmp(fa_res.ptr, fa_ref.ptr,fa_res.len), "from address value"); // tester->assert_true(tester, ta_res.len == ta_ref.len, "to address len"); @@ -243,5 +243,5 @@ void test_sa_config(protected_tester_t *tester) // ts_reference[2]->destroy(ts_reference[2]); // ts_request[3]->destroy(ts_request[3]); - sa_config->destroy(sa_config); + policy->destroy(policy); } diff --git a/Source/charon/testcases/sa_config_test.h b/Source/charon/testcases/policy_test.h index 7c6e2407b..6c8072a9c 100644 --- a/Source/charon/testcases/sa_config_test.h +++ b/Source/charon/testcases/policy_test.h @@ -1,7 +1,7 @@ /** - * @file sa_config_test.h + * @file policy_test.h * - * @brief Tests for the sa_config_t class. + * @brief Tests for the policy_t class. * */ @@ -21,21 +21,21 @@ */ -#ifndef _SA_CONFIG_TEST_H_ -#define _SA_CONFIG_TEST_H_ +#ifndef SA_CONFIG_TEST_H_ +#define SA_CONFIG_TEST_H_ #include <utils/tester.h> /** - * @brief Test function used to test the sa_config_t functionality. + * @brief Test function used to test the policy_t functionality. * * @param tester associated protected_tester_t object * * @ingroup testcases */ -void test_sa_config(protected_tester_t *tester); +void test_policy(protected_tester_t *tester); -#endif //_SA_CONFIG_TEST_H_ +#endif /* SA_CONFIG_TEST_H_ */ diff --git a/Source/charon/testcases/proposal_test.h b/Source/charon/testcases/proposal_test.h index d6d9681ac..059af11cc 100644 --- a/Source/charon/testcases/proposal_test.h +++ b/Source/charon/testcases/proposal_test.h @@ -35,7 +35,7 @@ */ void test_proposal(protected_tester_t *tester); -#endif //CHILD_PROPOSAL_TEST_H_ +#endif /* CHILD_PROPOSAL_TEST_H_ */ diff --git a/Source/charon/testcases/rsa_test.c b/Source/charon/testcases/rsa_test.c index a585806ba..75df88a04 100644 --- a/Source/charon/testcases/rsa_test.c +++ b/Source/charon/testcases/rsa_test.c @@ -71,8 +71,8 @@ void test_rsa(protected_tester_t *tester) public_key->get_key(public_key, &public_key_chunk); private_key->get_key(private_key, &private_key_chunk); - logger->log_chunk(logger, RAW, "Public Key", &public_key_chunk); - logger->log_chunk(logger, RAW, "Private Key", &private_key_chunk); + logger->log_chunk(logger, RAW, "Public Key", public_key_chunk); + logger->log_chunk(logger, RAW, "Private Key", private_key_chunk); allocator_free(public_key_chunk.ptr); diff --git a/Source/charon/testcases/testcases.c b/Source/charon/testcases/testcases.c index 8b3bfa9b9..aa8f372e4 100644 --- a/Source/charon/testcases/testcases.c +++ b/Source/charon/testcases/testcases.c @@ -56,8 +56,8 @@ #include <testcases/aes_cbc_crypter_test.h> #include <testcases/hmac_signer_test.h> #include <testcases/encryption_payload_test.h> -#include <testcases/init_config_test.h> -#include <testcases/sa_config_test.h> +#include <testcases/connection_test.h> +#include <testcases/policy_test.h> #include <testcases/proposal_test.h> #include <testcases/rsa_test.h> #include <testcases/kernel_interface_test.h> @@ -122,8 +122,8 @@ test_t aes_cbc_crypter_test = {test_aes_cbc_crypter, "AES CBC"}; test_t hmac_signer_test1 = {test_hmac_md5_signer, "HMAC MD5 signer test"}; test_t hmac_signer_test2 = {test_hmac_sha1_signer, "HMAC SHA1 signer test"}; test_t encryption_payload_test = {test_encryption_payload, "encryption payload test"}; -test_t init_config_test = {test_init_config, "init_config_t test"}; -test_t sa_config_test = {test_sa_config, "sa_config_t test"}; +test_t connection_test = {test_connection, "connection_t test"}; +test_t policy_test = {test_policy, "policy_t test"}; test_t proposal_test = {test_proposal, "proposal_t test"}; test_t rsa_test = {test_rsa, "RSA private/public key test"}; test_t kernel_interface_test = {test_kernel_interface, "Kernel Interface"}; @@ -235,8 +235,8 @@ int main() &hmac_signer_test1, &hmac_signer_test2, &encryption_payload_test, - &init_config_test, - &sa_config_test, + &connection_test, + &policy_test, &proposal_test, &rsa_test, NULL |