denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- rewrite of logger_manager, uses now one instance per context

Browse Source 
- cleanups for logger here and there
- removed critical flag check in payload verification (conformance to IKEv2)
- so thats and theres everywere... ;-)
This commit is contained in:
Martin Willi
2006-03-23 15:25:43 +00:00
parent 3264ce50b9
commit dec598220b
59 changed files with 461 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/charon/testcases/aes_cbc_crypter_test.c
+1 -3
View File
@@ -53,7 +53,7 @@ void test_aes_cbc_crypter(protected_tester_t *tester)
chunk_t decrypted1;
logger_t *logger;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"AES CBC");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
crypter = (crypter_t *) aes_cbc_crypter_create(16);
tester->assert_true(tester, (crypter != NULL), "create call test");
@@ -198,7 +198,5 @@ void test_aes_cbc_crypter(protected_tester_t *tester)
allocator_free_chunk(&decrypted3);
crypter->destroy(crypter);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
Source/charon/testcases/diffie_hellman_test.c
+4 -5
View File
@@ -39,7 +39,7 @@ void test_diffie_hellman(protected_tester_t *tester)
chunk_t my_public_value, other_public_value;
chunk_t my_secret, other_secret;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Diffie Hellman");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
my_diffie_hellman = diffie_hellman_create(MODP_1024_BIT);
@@ -60,18 +60,17 @@ void test_diffie_hellman(protected_tester_t *tester)
allocator_free(my_public_value.ptr);
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");
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);
tester->assert_true(tester,( other_diffie_hellman->get_shared_secret(other_diffie_hellman,&other_secret) == SUCCESS), "get_shared_secret call check");
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);
tester->assert_true(tester,( memcmp(my_secret.ptr,other_secret.ptr,other_secret.len) == 0), "shared secret same value check");
tester->assert_true(tester,(memcmp(my_secret.ptr,other_secret.ptr,other_secret.len) == 0), "shared secret same value check");
allocator_free(my_secret.ptr);
allocator_free(other_secret.ptr);
my_diffie_hellman->destroy(my_diffie_hellman);
other_diffie_hellman->destroy(other_diffie_hellman);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
Source/charon/testcases/encryption_payload_test.c
+1 -1
View File
@@ -60,7 +60,7 @@ void test_encryption_payload(protected_tester_t *tester)
key.ptr = key_bytes;
key.len = sizeof(key_bytes);
logger = charon->logger_manager->create_logger(charon->logger_manager, TESTER, NULL);
logger = charon->logger_manager->get_logger(charon->logger_manager, TESTER);
nonce.ptr = "test text und so...";
nonce.len = strlen(nonce.ptr) +1;
Source/charon/testcases/generator_test.c
+17 -55
View File
@@ -58,7 +58,7 @@ void test_generator_with_header_payload(protected_tester_t *tester)
chunk_t generated_data;
logger_t *logger;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"header payload");
logger = charon->logger_manager->get_logger(charon->logger_manager, TESTER);
header_data = ike_header_create();
header_data->set_initiator_spi(header_data,1);
@@ -129,7 +129,6 @@ void test_generator_with_header_payload(protected_tester_t *tester)
header_data->destroy(header_data);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
generator->destroy(generator);
}
@@ -143,7 +142,7 @@ void test_generator_with_transform_attribute(protected_tester_t *tester)
chunk_t generated_data;
logger_t *logger;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"transform_attribute payload");
logger = charon->logger_manager->get_logger(charon->logger_manager, TESTER);
/* test empty attribute */
@@ -222,9 +221,6 @@ void test_generator_with_transform_attribute(protected_tester_t *tester)
allocator_free_chunk(&generated_data);
attribute->destroy(attribute);
generator->destroy(generator);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
@@ -241,7 +237,7 @@ void test_generator_with_transform_substructure(protected_tester_t *tester)
chunk_t generated_data;
logger_t *logger;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"transform substr.");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
/* create generator */
generator = generator_create();
@@ -293,9 +289,6 @@ void test_generator_with_transform_substructure(protected_tester_t *tester)
allocator_free_chunk(&generated_data);
transform->destroy(transform);
generator->destroy(generator);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
@@ -312,7 +305,7 @@ void test_generator_with_proposal_substructure(protected_tester_t *tester)
chunk_t generated_data;
logger_t *logger;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"transform substr.");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
/* create generator */
generator = generator_create();
@@ -409,9 +402,6 @@ void test_generator_with_proposal_substructure(protected_tester_t *tester)
allocator_free_chunk(&generated_data);
proposal->destroy(proposal);
generator->destroy(generator);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
/*
@@ -432,7 +422,7 @@ void test_generator_with_sa_payload(protected_tester_t *tester)
chunk_t generated_data;
logger_t *logger;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with SA Payload");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
/* create generator */
generator = generator_create();
@@ -756,9 +746,6 @@ void test_generator_with_sa_payload(protected_tester_t *tester)
allocator_free_chunk(&generated_data);
generator->destroy(generator);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
/*
@@ -772,7 +759,7 @@ void test_generator_with_ke_payload(protected_tester_t *tester)
chunk_t generated_data;
chunk_t key_exchange_data;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with KE Payload");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
/* create generator */
generator = generator_create();
@@ -811,8 +798,6 @@ void test_generator_with_ke_payload(protected_tester_t *tester)
ke_payload->destroy(ke_payload);
generator->destroy(generator);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
@@ -827,7 +812,7 @@ void test_generator_with_notify_payload(protected_tester_t *tester)
chunk_t generated_data;
chunk_t spi,notification_data;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with Notify Payload");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
/* create generator */
generator = generator_create();
@@ -871,9 +856,6 @@ void test_generator_with_notify_payload(protected_tester_t *tester)
notify_payload->destroy(notify_payload);
generator->destroy(generator);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
/*
@@ -887,7 +869,7 @@ void test_generator_with_nonce_payload(protected_tester_t *tester)
chunk_t generated_data;
chunk_t nonce;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with Nonce Payload");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
/* create generator */
generator = generator_create();
@@ -925,9 +907,6 @@ void test_generator_with_nonce_payload(protected_tester_t *tester)
nonce_payload->destroy(nonce_payload);
generator->destroy(generator);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
/*
@@ -941,7 +920,7 @@ void test_generator_with_id_payload(protected_tester_t *tester)
chunk_t generated_data;
chunk_t id;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with ID Payload");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
/* create generator */
generator = generator_create();
@@ -979,8 +958,6 @@ void test_generator_with_id_payload(protected_tester_t *tester)
id_payload->destroy(id_payload);
generator->destroy(generator);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
/*
@@ -994,7 +971,7 @@ void test_generator_with_auth_payload(protected_tester_t *tester)
chunk_t generated_data;
chunk_t auth;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with AUTH Payload");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
/* create generator */
generator = generator_create();
@@ -1032,8 +1009,6 @@ void test_generator_with_auth_payload(protected_tester_t *tester)
auth_payload->destroy(auth_payload);
generator->destroy(generator);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
/*
@@ -1048,7 +1023,7 @@ void test_generator_with_ts_payload(protected_tester_t *tester)
logger_t *logger;
chunk_t generated_data;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with TS Payload");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
/* create generator */
generator = generator_create();
@@ -1116,8 +1091,6 @@ void test_generator_with_ts_payload(protected_tester_t *tester)
ts_payload->destroy(ts_payload);
generator->destroy(generator);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
/*
@@ -1131,7 +1104,7 @@ void test_generator_with_cert_payload(protected_tester_t *tester)
chunk_t generated_data;
chunk_t cert;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with CERT Payload");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
/* create generator */
generator = generator_create();
@@ -1168,8 +1141,6 @@ void test_generator_with_cert_payload(protected_tester_t *tester)
cert_payload->destroy(cert_payload);
generator->destroy(generator);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
/*
@@ -1183,7 +1154,7 @@ void test_generator_with_certreq_payload(protected_tester_t *tester)
chunk_t generated_data;
chunk_t certreq;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with CERTREQ Payload");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
/* create generator */
generator = generator_create();
@@ -1220,8 +1191,6 @@ void test_generator_with_certreq_payload(protected_tester_t *tester)
certreq_payload->destroy(certreq_payload);
generator->destroy(generator);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
/*
@@ -1235,7 +1204,7 @@ void test_generator_with_delete_payload(protected_tester_t *tester)
chunk_t generated_data;
chunk_t spis;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with DELETE Payload");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
/* create generator */
generator = generator_create();
@@ -1274,8 +1243,6 @@ void test_generator_with_delete_payload(protected_tester_t *tester)
delete_payload->destroy(delete_payload);
generator->destroy(generator);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
/*
@@ -1289,7 +1256,7 @@ void test_generator_with_vendor_id_payload(protected_tester_t *tester)
chunk_t generated_data;
chunk_t data;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with VENDOR ID Payload");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
/* create generator */
generator = generator_create();
@@ -1323,8 +1290,6 @@ void test_generator_with_vendor_id_payload(protected_tester_t *tester)
vendor_id_payload->destroy(vendor_id_payload);
generator->destroy(generator);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
/*
@@ -1339,7 +1304,7 @@ void test_generator_with_cp_payload(protected_tester_t *tester)
chunk_t generated_data;
logger_t *logger;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"CP Payload");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
/* create generator */
generator = generator_create();
@@ -1396,9 +1361,6 @@ void test_generator_with_cp_payload(protected_tester_t *tester)
allocator_free_chunk(&generated_data);
configuration->destroy(configuration);
generator->destroy(generator);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
/*
@@ -1412,7 +1374,7 @@ void test_generator_with_eap_payload(protected_tester_t *tester)
chunk_t generated_data;
chunk_t message;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with EAP Payload");
logger = charon->logger_manager->get_logger(charon->logger_manager,TESTER);
/* create generator */
generator = generator_create();
Source/charon/testcases/hmac_signer_test.c
+3 -7
View File
@@ -56,7 +56,7 @@ void test_hmac_md5_signer(protected_tester_t *tester)
logger_t *logger;
bool valid;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"HMAC MD5 96");
logger = charon->logger_manager->get_logger(charon->logger_manager, TESTER);
signer_t *signer = (signer_t *) signer_create(AUTH_HMAC_MD5_96);
tester->assert_true(tester, (signer != NULL), "signer create call check");
@@ -104,12 +104,8 @@ void test_hmac_md5_signer(protected_tester_t *tester)
valid = signer->verify_signature(signer, data[i],wrong_reference[i]);
tester->assert_true(tester, (valid == FALSE), "Signature not valid check");
}
}
signer->destroy(signer);
charon->logger_manager->destroy_logger(charon->logger_manager,logger);
}
@@ -138,7 +134,7 @@ void test_hmac_sha1_signer(protected_tester_t *tester)
logger_t *logger;
bool valid;
logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"HMAC SHA1 96");
logger = charon->logger_manager->get_logger(charon->logger_manager, TESTER);
signer_t *signer = (signer_t *) signer_create(AUTH_HMAC_SHA1_96);
tester->assert_true(tester, (signer != NULL), "signer create call check");
Source/charon/testcases/policy_test.c
+1 -1
View File
@@ -44,7 +44,7 @@ void test_policy(protected_tester_t *tester)
logger_t *logger;
identification_t *alice, *bob;
logger = charon->logger_manager->create_logger(charon->logger_manager, TESTER, NULL);
logger = charon->logger_manager->get_logger(charon->logger_manager, TESTER);
logger->disable_level(logger, FULL);
alice = identification_create_from_string(ID_IPV4_ADDR, "152.96.193.131");
Source/charon/testcases/rsa_test.c
+1 -1
View File
@@ -53,7 +53,7 @@ void test_rsa(protected_tester_t *tester)
data.ptr = test_data;
data.len = sizeof(test_data);
logger = charon->logger_manager->create_logger(charon->logger_manager, TESTER, NULL);
logger = charon->logger_manager->get_logger(charon->logger_manager, TESTER);
logger->disable_level(logger, FULL);
private_key = rsa_private_key_create();
Source/charon/testcases/testcases.c
+3 -3
View File
@@ -249,9 +249,9 @@ int main()
daemon_create();
charon->logger_manager->disable_logger_level(charon->logger_manager,TESTER,FULL);
charon->logger_manager->enable_logger_level(charon->logger_manager,CHILD_SA,FULL);
/* charon->logger_manager->enable_logger_level(charon->logger_manager,TESTER,RAW); */
charon->logger_manager->disable_log_level(charon->logger_manager,TESTER,FULL);
charon->logger_manager->enable_log_level(charon->logger_manager,CHILD_SA,FULL);
/* charon->logger_manager->enable_log_level(charon->logger_manager,TESTER,RAW); */
tester_t *tester = tester_create(test_output, FALSE);