DELETE payload implemented and tested

5 files changed, 124 insertions, 4 deletions

diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c
index bb40b007d..75075f2f7 100644
--- a/Source/charon/testcases/generator_test.c
+++ b/Source/charon/testcases/generator_test.c
@@ -43,6 +43,7 @@
 #include <encoding/payloads/cert_payload.h>
 #include <encoding/payloads/certreq_payload.h>
 #include <encoding/payloads/ts_payload.h>
+#include <encoding/payloads/delete_payload.h>
 
 /*
  * Described in Header 
@@ -1201,7 +1202,7 @@ void test_generator_with_certreq_payload(tester_t *tester)
 	chunk_t generated_data;
 	chunk_t certreq;
 	
-	logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with CERT Payload");
+	logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with CERTREQ Payload");
 	
 	/* create generator */
 	generator = generator_create();
@@ -1241,3 +1242,57 @@ void test_generator_with_certreq_payload(tester_t *tester)
 		
 	charon->logger_manager->destroy_logger(charon->logger_manager,logger);	
 }
+
+/*
+ * Described in header.
+ */ 
+void test_generator_with_delete_payload(tester_t *tester)
+{
+	generator_t *generator;
+	delete_payload_t *delete_payload;
+	logger_t *logger;
+	chunk_t generated_data;
+	chunk_t spis;
+	
+	logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with DELETE Payload");
+	
+	/* create generator */
+	generator = generator_create();
+	tester->assert_true(tester,(generator != NULL), "generator create check");
+	
+	delete_payload = delete_payload_create();
+	
+	
+	spis.ptr = "123456789012";
+	spis.len = strlen(spis.ptr);
+
+	delete_payload->set_protocol_id(delete_payload,AH);
+	delete_payload->set_spi_count(delete_payload,3);
+	delete_payload->set_spi_size(delete_payload,4);
+	delete_payload->set_spis(delete_payload,spis);
+	
+	generator->generate_payload(generator,(payload_t *)delete_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,
+		0x02,0x04,0x00,0x03,
+		/* delete 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);
+	
+	delete_payload->destroy(delete_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 4ea7258f5..2f7828b82 100644
--- a/Source/charon/testcases/generator_test.h
+++ b/Source/charon/testcases/generator_test.h
@@ -134,7 +134,6 @@ void test_generator_with_ts_payload(tester_t *tester);
  */
 void test_generator_with_cert_payload(tester_t *tester);
 
-
 /**
  * @brief Test function used to test the generator with CERTREQ payload.
  * 
@@ -144,5 +143,14 @@ void test_generator_with_cert_payload(tester_t *tester);
  */
 void test_generator_with_certreq_payload(tester_t *tester);
 
+/**
+ * @brief Test function used to test the generator with DELETE payload.
+ * 
+ * @param tester associated tester_t object
+ * 
+ * @ingroup testcases
+ */
+void test_generator_with_delete_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 2de5806b4..5bf92fa96 100644
--- a/Source/charon/testcases/parser_test.c
+++ b/Source/charon/testcases/parser_test.c
@@ -39,6 +39,7 @@
 #include <encoding/payloads/cert_payload.h>
 #include <encoding/payloads/certreq_payload.h>
 #include <encoding/payloads/ts_payload.h>
+#include <encoding/payloads/delete_payload.h>
 
 
 /*
@@ -772,3 +773,45 @@ void test_parser_with_certreq_payload(tester_t *tester)
 	allocator_free_chunk(&result);
 }
 
+/*
+ * Described in Header 
+ */
+void test_parser_with_delete_payload(tester_t *tester)
+{
+	parser_t *parser;
+	delete_payload_t *delete_payload;
+	status_t status;
+	chunk_t delete_chunk, result;
+	
+	u_int8_t delete_bytes[] = {
+		0x00,0x00,0x00,0x14, /* payload header */
+		0x03,0x03,0x00,0x04,
+			0x04,0x05,0x06,0x07,/* 12 Byte data */
+			0x08,0x09,0x0A,0x2B,
+			0x0C,0x0D,0x0E,0x0F
+	};
+	
+	delete_chunk.ptr = delete_bytes;
+	delete_chunk.len = sizeof(delete_bytes);
+
+	parser = parser_create(delete_chunk);
+	tester->assert_true(tester,(parser != NULL), "parser create check");
+	status = parser->parse_payload(parser, DELETE, (payload_t**)&delete_payload);
+	tester->assert_true(tester,(status == SUCCESS),"parse_payload call check");
+	parser->destroy(parser);
+	
+	if (status != SUCCESS)
+	{
+		return;	
+	}
+	result = delete_payload->get_spis(delete_payload);
+	tester->assert_true(tester,(delete_payload->get_protocol_id(delete_payload) == ESP), "is ESP protocol");
+	tester->assert_true(tester,(delete_payload->get_spi_size(delete_payload) == 3), "SPI size check");
+	tester->assert_true(tester,(delete_payload->get_spi_count(delete_payload) == 4), "SPI count check");
+	tester->assert_true(tester,(result.len == 12), "parsed data lenght");
+	tester->assert_false(tester,(memcmp(delete_bytes + 8, result.ptr, result.len)), "parsed data");
+	tester->assert_true(tester,(((payload_t *)delete_payload)->verify((payload_t *)delete_payload) == SUCCESS), "verify check");
+	
+	delete_payload->destroy(delete_payload);
+}
+
diff --git a/Source/charon/testcases/parser_test.h b/Source/charon/testcases/parser_test.h
index f0a79b89b..0de800516 100644
--- a/Source/charon/testcases/parser_test.h
+++ b/Source/charon/testcases/parser_test.h
@@ -125,4 +125,14 @@ void test_parser_with_cert_payload(tester_t *tester);
  */
 void test_parser_with_certreq_payload(tester_t *tester);
 
+/**
+ * @brief Test function used to test the parser_t functionality when 
+ * parsing a CERTREQ payload.
+ *
+ * @param tester 	associated tester_t object
+ * 
+ * @ingroup testcases
+ */
+void test_parser_with_delete_payload(tester_t *tester);
+
 #endif /*PARSER_TEST_H_*/
diff --git a/Source/charon/testcases/testcases.c b/Source/charon/testcases/testcases.c
index 011195a3f..3226126d6 100644
--- a/Source/charon/testcases/testcases.c
+++ b/Source/charon/testcases/testcases.c
@@ -91,6 +91,7 @@ test_t generator_test10 = {test_generator_with_auth_payload,"Generator: AUTH Pay
 test_t generator_test11 = {test_generator_with_ts_payload,"Generator: TS Payload"};
 test_t generator_test12 = {test_generator_with_cert_payload,"Generator: CERT Payload"};
 test_t generator_test13 = {test_generator_with_certreq_payload,"Generator: CERTREQ Payload"};
+test_t generator_test14 = {test_generator_with_delete_payload,"Generator: DELETE 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"};
@@ -101,6 +102,7 @@ test_t parser_test7 = {test_parser_with_auth_payload, "Parser: AUTH payload"};
 test_t parser_test8 = {test_parser_with_ts_payload, "Parser: TS payload"};
 test_t parser_test9 = {test_parser_with_cert_payload, "Parser: CERT payload"};
 test_t parser_test10 = {test_parser_with_certreq_payload, "Parser: CERTREQ payload"};
+test_t parser_test11 = {test_parser_with_delete_payload, "Parser: DELETE 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"};
@@ -192,6 +194,7 @@ int main()
 		&parser_test8,
 		&parser_test9,
 		&parser_test10,
+		&parser_test11,
 		&generator_test3,
 		&generator_test4,
 		&generator_test5,
@@ -203,6 +206,7 @@ int main()
 		&generator_test11,
 		&generator_test12,
 		&generator_test13,
+		&generator_test14,
 		&ike_sa_manager_test,
 		&packet_test,
 		&diffie_hellman_test,
@@ -233,8 +237,8 @@ int main()
 	tester_t *tester = tester_create(test_output, FALSE);
 	
 
-	tester->perform_tests(tester,all_tests);
-//	tester->perform_test(tester,&generator_test13); 
+//	tester->perform_tests(tester,all_tests);
+	tester->perform_test(tester,&parser_test11); 
 	
 	
 	tester->destroy(tester);