5 files changed, 132 insertions, 9 deletions

diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c
index 1dbef6f83..636ffb224 100644
--- a/Source/charon/testcases/generator_test.c
+++ b/Source/charon/testcases/generator_test.c
@@ -38,6 +38,7 @@
 #include <encoding/payloads/ke_payload.h>
 #include <encoding/payloads/notify_payload.h>
 #include <encoding/payloads/nonce_payload.h>
+#include <encoding/payloads/id_payload.h>
 
 /*
  * Described in Header 
@@ -731,3 +732,57 @@ void test_generator_with_nonce_payload(tester_t *tester)
 	
 }
 
+/*
+ * Described in header.
+ */ 
+void test_generator_with_id_payload(tester_t *tester)
+{
+	generator_t *generator;
+	id_payload_t *id_payload;
+	logger_t *logger;
+	chunk_t generated_data;
+	chunk_t id;
+	
+	logger = global_logger_manager->create_logger(global_logger_manager,TESTER,"Message with ID Payload");
+	
+	/* create generator */
+	generator = generator_create();
+	tester->assert_true(tester,(generator != NULL), "generator create check");
+	
+	id_payload = id_payload_create(FALSE);
+	
+	
+	id.ptr = "123456789012";
+	id.len = strlen(id.ptr);
+
+	id_payload->set_id_type(id_payload,ID_IPV4_ADDR);
+	id_payload->set_data(id_payload,id);
+	
+	generator->generate_payload(generator,(payload_t *)id_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,0x14,
+		0x01,0x00,0x00,0x00,
+		/* id 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);
+	
+	id_payload->destroy(id_payload);
+	generator->destroy(generator);
+		
+	global_logger_manager->destroy_logger(global_logger_manager,logger);	
+	
+}
+
diff --git a/Source/charon/testcases/generator_test.h b/Source/charon/testcases/generator_test.h
index 64484abd4..02b050fd8 100644
--- a/Source/charon/testcases/generator_test.h
+++ b/Source/charon/testcases/generator_test.h
@@ -28,7 +28,7 @@
 /**
  * @brief Test function used to test the generator with header payload.
  * 
- * @param tester associated tester object
+ * @param tester associated tester_t object
  * 
  * @ingroup testcases
  */
@@ -37,7 +37,7 @@ void test_generator_with_header_payload(tester_t *tester);
 /**
  * @brief Test function used to test the generator with transform attribute payload.
  *
- * @param tester associated tester object
+ * @param tester associated tester_t object
  * 
  * @ingroup testcases
  */
@@ -47,7 +47,7 @@ void test_generator_with_transform_attribute(tester_t *tester);
 /**
  * @brief Test function used to test the generator with transform substructure payload.
  *
- * @param tester associated tester object
+ * @param tester associated tester_t object
  * 
  * @ingroup testcases
  */
@@ -56,7 +56,7 @@ void test_generator_with_transform_substructure(tester_t *tester);
 /**
  * @brief Test function used to test the generator with proposal substructure payload.
  *
- * @param tester associated tester object
+ * @param tester associated tester_t object
  * 
  * @ingroup testcases
  */
@@ -65,7 +65,7 @@ void test_generator_with_proposal_substructure(tester_t *tester);
 /**
  * @brief Test function used to test the generator with SA payload.
  * 
- * @param tester associated tester object
+ * @param tester associated tester_t object
  * 
  * @ingroup testcases
  */
@@ -74,7 +74,7 @@ void test_generator_with_sa_payload(tester_t *tester);
 /**
  * @brief Test function used to test the generator with KE payload.
  *
- * @param tester associated tester object
+ * @param tester associated tester_t object
  * 
  * @ingroup testcases
  */
@@ -83,7 +83,7 @@ void test_generator_with_ke_payload(tester_t *tester);
 /**
  * @brief Test function used to test the generator with Notify payload.
  *
- * @param tester associated tester object
+ * @param tester associated tester_t object
  * 
  * @ingroup testcases
  */
@@ -92,11 +92,20 @@ void test_generator_with_notify_payload(tester_t *tester);
 /**
  * @brief Test function used to test the generator with Nonce payload.
  * 
- * @param tester associated tester object
+ * @param tester associated tester_t object
  * 
  * @ingroup testcases
  */
 void test_generator_with_nonce_payload(tester_t *tester);
 
+/**
+ * @brief Test function used to test the generator with ID payload.
+ * 
+ * @param tester associated tester_t object
+ * 
+ * @ingroup testcases
+ */
+void test_generator_with_id_payload(tester_t *tester);
+
 
 #endif /*GENERATOR_TEST_H_*/
diff --git a/Source/charon/testcases/parser_test.c b/Source/charon/testcases/parser_test.c
index 70560b25b..ae12c5720 100644
--- a/Source/charon/testcases/parser_test.c
+++ b/Source/charon/testcases/parser_test.c
@@ -32,6 +32,7 @@
 #include <encoding/payloads/ike_header.h>
 #include <encoding/payloads/sa_payload.h>
 #include <encoding/payloads/nonce_payload.h>
+#include <encoding/payloads/id_payload.h>
 #include <encoding/payloads/ke_payload.h>
 #include <encoding/payloads/notify_payload.h>
 
@@ -224,6 +225,47 @@ void test_parser_with_nonce_payload(tester_t *tester)
 /*
  * Described in Header 
  */
+void test_parser_with_id_payload(tester_t *tester)
+{
+	parser_t *parser;
+	id_payload_t *id_payload;
+	status_t status;
+	chunk_t id_chunk, result;
+	
+	u_int8_t id_bytes[] = {
+		0x00,0x00,0x00,0x14, /* payload header */
+		0x05,0x01,0x02,0x03,
+			0x04,0x05,0x06,0x07,/* 12 Byte nonce */
+			0x08,0x09,0x0A,0x2B,
+			0x0C,0x0D,0x0E,0x0F
+	};
+	
+	id_chunk.ptr = id_bytes;
+	id_chunk.len = sizeof(id_bytes);
+
+	parser = parser_create(id_chunk);
+	tester->assert_true(tester,(parser != NULL), "parser create check");
+	status = parser->parse_payload(parser, ID_INITIATOR, (payload_t**)&id_payload);
+	tester->assert_true(tester,(status == SUCCESS),"parse_payload call check");
+	parser->destroy(parser);
+	
+	if (status != SUCCESS)
+	{
+		return;	
+	}
+	result = id_payload->get_data(id_payload);
+	tester->assert_true(tester,(id_payload->get_initiator(id_payload) == TRUE), "is IDi payload");
+	tester->assert_true(tester,(id_payload->get_id_type(id_payload) == ID_IPV6_ADDR), "is ID_IPV6_ADDR ID type");
+	tester->assert_true(tester,(result.len == 12), "parsed data lenght");
+	tester->assert_false(tester,(memcmp(id_bytes + 8, result.ptr, result.len)), "parsed nonce data");
+	id_payload->destroy(id_payload);
+	allocator_free_chunk(&result);
+}
+
+
+/*
+ * Described in Header 
+ */
 void test_parser_with_ke_payload(tester_t *tester)
 {
 	parser_t *parser;
diff --git a/Source/charon/testcases/parser_test.h b/Source/charon/testcases/parser_test.h
index 48f3a1fd5..a80888fe8 100644
--- a/Source/charon/testcases/parser_test.h
+++ b/Source/charon/testcases/parser_test.h
@@ -57,6 +57,16 @@ void test_parser_with_nonce_payload(tester_t *tester);
 
 /**
  * @brief Test function used to test the parser_t functionality when 
+ * parsing a ID payload.
+ *
+ * @param tester 	associated tester_t object
+ * 
+ * @ingroup testcases
+ */
+void test_parser_with_id_payload(tester_t *tester);
+
+/**
+ * @brief Test function used to test the parser_t functionality when 
  * parsing a ke payload.
  *
  * @param tester 	associated tester_t object
diff --git a/Source/charon/testcases/testcases.c b/Source/charon/testcases/testcases.c
index ecbbb91f2..a672b1564 100644
--- a/Source/charon/testcases/testcases.c
+++ b/Source/charon/testcases/testcases.c
@@ -136,6 +136,7 @@ test_t generator_test5 = {test_generator_with_sa_payload,"Generator: Message wit
 test_t generator_test6 = {test_generator_with_ke_payload,"Generator: KE Payload"};
 test_t generator_test7 = {test_generator_with_notify_payload,"Generator: Notify Payload"};
 test_t generator_test8 = {test_generator_with_nonce_payload,"Generator: Nonce Payload"};
+test_t generator_test9 = {test_generator_with_id_payload,"Generator: ID Payload"};
 
 
 /**
@@ -164,6 +165,10 @@ test_t parser_test4 = {test_parser_with_ke_payload, "Parser: key exchange payloa
  */
 test_t parser_test5 = {test_parser_with_notify_payload, "Parser: notify payload"};
 
+/**
+ * Parser test for ike notify payload
+ */
+test_t parser_test6 = {test_parser_with_id_payload, "Parser: ID payload"};
 
 /**
  * Test for packet_t
@@ -274,12 +279,14 @@ logger_manager_t *global_logger_manager;
 		&parser_test3,
 		&parser_test4,
 		&parser_test5,
+		&parser_test6,
 		&generator_test3,
 		&generator_test4,
 		&generator_test5,
 		&generator_test6,
 		&generator_test7,
 		&generator_test8,
+		&generator_test9,
 		&ike_sa_manager_test,
 		&packet_test,
 		&diffie_hellman_test,
@@ -310,7 +317,7 @@ logger_manager_t *global_logger_manager;
 
 
 	tester->perform_tests(tester,all_tests);
-//	tester->perform_test(tester,&hmac_signer_test2); 
+	//tester->perform_test(tester,&generator_test9);