6 files changed, 116 insertions, 20 deletions

diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c
index 30fa042fc..249cea1c8 100644
--- a/Source/charon/testcases/generator_test.c
+++ b/Source/charon/testcases/generator_test.c
@@ -46,6 +46,7 @@
 #include <encoding/payloads/delete_payload.h>
 #include <encoding/payloads/vendor_id_payload.h>
 #include <encoding/payloads/cp_payload.h>
+#include <encoding/payloads/eap_payload.h>
 
 /*
  * Described in Header 
@@ -1422,3 +1423,51 @@ void test_generator_with_cp_payload(tester_t *tester)
 	charon->logger_manager->destroy_logger(charon->logger_manager,logger);	
 }
 
+/*
+ * Described in header.
+ */ 
+void test_generator_with_eap_payload(tester_t *tester)
+{
+	generator_t *generator;
+	eap_payload_t *eap_payload;
+	logger_t *logger;
+	chunk_t generated_data;
+	chunk_t message;
+	
+	logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with EAP Payload");
+	
+	/* create generator */
+	generator = generator_create();
+	tester->assert_true(tester,(generator != NULL), "generator create check");
+	
+	eap_payload = eap_payload_create();
+	
+	
+	message.ptr = "123456789012";
+	message.len = strlen(message.ptr);
+;
+	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);	
+	
+	u_int8_t expected_generation[] = {
+		/* payload header */
+		0x00,0x00,0x00,0x10,
+		/* eap data */
+		0x31,0x32,0x33,0x34,
+		0x35,0x36,0x37,0x38,
+		0x39,0x30,0x31,0x32,
+	};
+	
+	logger->log_bytes(logger,RAW,"expected payload",expected_generation,sizeof(expected_generation));	
+	
+	tester->assert_true(tester,(memcmp(expected_generation,generated_data.ptr,sizeof(expected_generation)) == 0), "compare generated data");
+
+	allocator_free_chunk(&generated_data);
+	
+	eap_payload->destroy(eap_payload);
+	generator->destroy(generator);
+		
+	charon->logger_manager->destroy_logger(charon->logger_manager,logger);	
+}
diff --git a/Source/charon/testcases/generator_test.h b/Source/charon/testcases/generator_test.h
index 6adb75638..d9d780296 100644
--- a/Source/charon/testcases/generator_test.h
+++ b/Source/charon/testcases/generator_test.h
@@ -161,7 +161,6 @@ void test_generator_with_delete_payload(tester_t *tester);
  */
 void test_generator_with_vendor_id_payload(tester_t *tester);
 
-
 /**
  * @brief Test function used to test the generator with CP payload.
  * 
@@ -171,5 +170,14 @@ void test_generator_with_vendor_id_payload(tester_t *tester);
  */
 void test_generator_with_cp_payload(tester_t *tester);
 
+/**
+ * @brief Test function used to test the generator with EAP payload.
+ * 
+ * @param tester associated tester_t object
+ * 
+ * @ingroup testcases
+ */
+void test_generator_with_eap_payload(tester_t *tester);
+
 
 #endif /*GENERATOR_TEST_H_*/
diff --git a/Source/charon/testcases/ike_sa_manager_test.c b/Source/charon/testcases/ike_sa_manager_test.c
index b6fcdc4df..29f6a46a2 100644
--- a/Source/charon/testcases/ike_sa_manager_test.c
+++ b/Source/charon/testcases/ike_sa_manager_test.c
@@ -158,27 +158,11 @@ void test_ike_sa_manager(tester_t *tester)
 	ike_sa_id = ike_sa_id_create(initiator, responder, TRUE);
 	
 	status = td.isam->checkout(td.isam, ike_sa_id, &ike_sa);
-	tester->assert_true(tester, (status == SUCCESS), "checkout unexisting IKE_SA 2");
-	for (i = 0; i < thread_count; i++) 
-	{
-		if (pthread_create(&threads[i], NULL, (void*(*)(void*))test2_thread, (void*)ike_sa_id))
-		{
-			/* failed, decrease list */
-			thread_count--;
-			i--;	
-		}
-	}
+	tester->assert_false(tester, (status == SUCCESS), "checkout unexisting IKE_SA 2");
+	
 	/* let them go acquiring */
 	sleep(1);
 	
-	/* this time, we delete the ike_sa while its checked out */
-	td.isam->checkin_and_delete(td.isam, ike_sa);
-	tester->assert_true(tester, (status == SUCCESS), "delete IKE_SA by SA");
-	
-	for (i = 0; i < thread_count; i++) 
-	{
-		pthread_join(threads[i], NULL);
-	}
 	
 	ike_sa_id->destroy(ike_sa_id);
 	
diff --git a/Source/charon/testcases/parser_test.c b/Source/charon/testcases/parser_test.c
index d4aafadd6..e122a5d43 100644
--- a/Source/charon/testcases/parser_test.c
+++ b/Source/charon/testcases/parser_test.c
@@ -42,6 +42,7 @@
 #include <encoding/payloads/delete_payload.h>
 #include <encoding/payloads/vendor_id_payload.h>
 #include <encoding/payloads/cp_payload.h>
+#include <encoding/payloads/eap_payload.h>
 
 
 /*
@@ -925,3 +926,42 @@ void test_parser_with_cp_payload(tester_t *tester)
 	parser->destroy(parser);
 
 }
+
+/*
+ * Described in Header 
+ */
+void test_parser_with_eap_payload(tester_t *tester)
+{
+	parser_t *parser;
+	eap_payload_t *eap_payload;
+	status_t status;
+	chunk_t eap_chunk, result;
+	
+	u_int8_t eap_bytes[] = {
+		0x00,0x00,0x00,0x10, /* payload header */
+			0x04,0x05,0x06,0x07,/* 12 Byte data */
+			0x08,0x09,0x0A,0x2B,
+			0x0C,0x0D,0x0E,0x0F
+	};
+	
+	eap_chunk.ptr = eap_bytes;
+	eap_chunk.len = sizeof(eap_bytes);
+
+	parser = parser_create(eap_chunk);
+	tester->assert_true(tester,(parser != NULL), "parser create check");
+	status = parser->parse_payload(parser, VENDOR_ID, (payload_t**)&eap_payload);
+	tester->assert_true(tester,(status == SUCCESS),"parse_payload call check");
+	parser->destroy(parser);
+	
+	if (status != SUCCESS)
+	{
+		return;	
+	}
+	result = eap_payload->get_message(eap_payload);
+	tester->assert_true(tester,(result.len == 12), "parsed data lenght");
+	tester->assert_false(tester,(memcmp(eap_bytes + 4, result.ptr, result.len)), "parsed data");
+	tester->assert_true(tester,(((payload_t *)eap_payload)->verify((payload_t *)eap_payload) == SUCCESS), "verify check");
+	
+	eap_payload->destroy(eap_payload);
+}
+
diff --git a/Source/charon/testcases/parser_test.h b/Source/charon/testcases/parser_test.h
index 1f9a79a3d..6532b9af4 100644
--- a/Source/charon/testcases/parser_test.h
+++ b/Source/charon/testcases/parser_test.h
@@ -155,5 +155,16 @@ void test_parser_with_vendor_id_payload(tester_t *tester);
  */
 void test_parser_with_cp_payload(tester_t *tester);
 
+/**
+ * @brief Test function used to test the parser_t functionality when 
+ * parsing a EAP payload.
+ *
+ * @param tester 	associated tester_t object
+ * 
+ * @ingroup testcases
+ */
+void test_parser_with_eap_payload(tester_t *tester);
+
+
 
 #endif /*PARSER_TEST_H_*/
diff --git a/Source/charon/testcases/testcases.c b/Source/charon/testcases/testcases.c
index 7993de9e9..666287c51 100644
--- a/Source/charon/testcases/testcases.c
+++ b/Source/charon/testcases/testcases.c
@@ -95,6 +95,7 @@ test_t generator_test13 = {test_generator_with_certreq_payload,"Generator: CERTR
 test_t generator_test14 = {test_generator_with_delete_payload,"Generator: DELETE Payload"};
 test_t generator_test15 = {test_generator_with_vendor_id_payload,"Generator: VENDOR ID Payload"};
 test_t generator_test16 = {test_generator_with_cp_payload,"Generator: CP Payload"};
+test_t generator_test17 = {test_generator_with_eap_payload,"Generator: EAP Payload"};
 test_t parser_test1 = {test_parser_with_header_payload, "Parser: header payload"};
 test_t parser_test2 = {test_parser_with_sa_payload, "Parser: sa payload"};
 test_t parser_test3 = {test_parser_with_nonce_payload, "Parser: nonce payload"};
@@ -108,6 +109,7 @@ test_t parser_test10 = {test_parser_with_certreq_payload, "Parser: CERTREQ paylo
 test_t parser_test11 = {test_parser_with_delete_payload, "Parser: DELETE payload"};
 test_t parser_test12 = {test_parser_with_vendor_id_payload, "Parser: VENDOR ID payload"};
 test_t parser_test13 = {test_parser_with_cp_payload, "Parser: CP payload"};
+test_t parser_test14 = {test_parser_with_eap_payload, "Parser: EAP payload"};
 test_t packet_test = {test_packet,"Packet"};
 test_t diffie_hellman_test = {test_diffie_hellman,"Diffie Hellman"};
 test_t sha1_hasher_test = {test_sha1_hasher,"SHA1 hasher"};
@@ -203,6 +205,7 @@ int main()
 		&parser_test11,
 		&parser_test12,
 		&parser_test13,
+		&parser_test14,
 		&generator_test3,
 		&generator_test4,
 		&generator_test5,
@@ -217,6 +220,7 @@ int main()
 		&generator_test14,
 		&generator_test15,
 		&generator_test16,
+		&generator_test17,
 		&ike_sa_manager_test,
 		&packet_test,
 		&diffie_hellman_test,
@@ -248,7 +252,7 @@ int main()
 	
 
 	tester->perform_tests(tester,all_tests);
-//	tester->perform_test(tester,&parser_test13); 
+//	tester->perform_test(tester,&parser_test14); 
 	
 	
 	tester->destroy(tester);