5 files changed, 119 insertions, 2 deletions

diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c
index a2ae01565..de0d13575 100644
--- a/Source/charon/testcases/generator_test.c
+++ b/Source/charon/testcases/generator_test.c
@@ -40,6 +40,7 @@
 #include <encoding/payloads/nonce_payload.h>
 #include <encoding/payloads/id_payload.h>
 #include <encoding/payloads/auth_payload.h>
+#include <encoding/payloads/cert_payload.h>
 #include <encoding/payloads/ts_payload.h>
 
 /*
@@ -1055,6 +1056,58 @@ void test_generator_with_auth_payload(tester_t *tester)
 /*
  * Described in header.
  */ 
+void test_generator_with_cert_payload(tester_t *tester)
+{
+	generator_t *generator;
+	cert_payload_t *cert_payload;
+	logger_t *logger;
+	chunk_t generated_data;
+	chunk_t cert;
+	
+	logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with CERT Payload");
+	
+	/* create generator */
+	generator = generator_create();
+	tester->assert_true(tester,(generator != NULL), "generator create check");
+	
+	cert_payload = cert_payload_create();
+	
+	
+	cert.ptr = "123456789012";
+	cert.len = strlen(cert.ptr);
+
+	cert_payload->set_cert_encoding(cert_payload,PGP_CERTIFICATE);
+	cert_payload->set_data(cert_payload,cert);
+	
+	generator->generate_payload(generator,(payload_t *)cert_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,0x11,
+		0x02,
+		/* cert 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);
+	
+	cert_payload->destroy(cert_payload);
+	generator->destroy(generator);
+		
+	charon->logger_manager->destroy_logger(charon->logger_manager,logger);	
+}
+
+/*
+ * Described in header.
+ */ 
 void test_generator_with_ts_payload(tester_t *tester)
 {
 	generator_t *generator;
diff --git a/Source/charon/testcases/generator_test.h b/Source/charon/testcases/generator_test.h
index 34c054a82..d5e3aab0c 100644
--- a/Source/charon/testcases/generator_test.h
+++ b/Source/charon/testcases/generator_test.h
@@ -117,6 +117,15 @@ void test_generator_with_id_payload(tester_t *tester);
 void test_generator_with_auth_payload(tester_t *tester);
 
 /**
+ * @brief Test function used to test the generator with CERT payload.
+ * 
+ * @param tester associated tester_t object
+ * 
+ * @ingroup testcases
+ */
+void test_generator_with_cert_payload(tester_t *tester);
+
+/**
  * @brief Test function used to test the generator with TS payload.
  * 
  * @param tester associated tester_t object
diff --git a/Source/charon/testcases/parser_test.c b/Source/charon/testcases/parser_test.c
index 2815c63a8..d3ec5dd1a 100644
--- a/Source/charon/testcases/parser_test.c
+++ b/Source/charon/testcases/parser_test.c
@@ -36,6 +36,7 @@
 #include <encoding/payloads/ke_payload.h>
 #include <encoding/payloads/notify_payload.h>
 #include <encoding/payloads/auth_payload.h>
+#include <encoding/payloads/cert_payload.h>
 #include <encoding/payloads/ts_payload.h>
 
 
@@ -691,3 +692,43 @@ void test_parser_with_ts_payload(tester_t *tester)
 	
 	ts_payload->destroy(ts_payload);
 }
+
+/*
+ * Described in Header 
+ */
+void test_parser_with_cert_payload(tester_t *tester)
+{
+	parser_t *parser;
+	cert_payload_t *cert_payload;
+	status_t status;
+	chunk_t cert_chunk, result;
+	
+	u_int8_t cert_bytes[] = {
+		0x00,0x00,0x00,0x11, /* payload header */
+		0x03,
+			0x04,0x05,0x06,0x07,/* 12 Byte nonce */
+			0x08,0x09,0x0A,0x2B,
+			0x0C,0x0D,0x0E,0x0F
+	};
+	
+	cert_chunk.ptr = cert_bytes;
+	cert_chunk.len = sizeof(cert_bytes);
+
+	parser = parser_create(cert_chunk);
+	tester->assert_true(tester,(parser != NULL), "parser create check");
+	status = parser->parse_payload(parser, CERTIFICATE, (payload_t**)&cert_payload);
+	tester->assert_true(tester,(status == SUCCESS),"parse_payload call check");
+	parser->destroy(parser);
+	
+	if (status != SUCCESS)
+	{
+		return;	
+	}
+	result = cert_payload->get_data_clone(cert_payload);
+	tester->assert_true(tester,(cert_payload->get_cert_encoding(cert_payload) == DNS_SIGNED_KEY), "is DNS_SIGNED_KEY encoding");
+	tester->assert_true(tester,(result.len == 12), "parsed data lenght");
+	tester->assert_false(tester,(memcmp(cert_bytes + 5, result.ptr, result.len)), "parsed data");
+	cert_payload->destroy(cert_payload);
+	allocator_free_chunk(&result);
+}
+
diff --git a/Source/charon/testcases/parser_test.h b/Source/charon/testcases/parser_test.h
index 11af67ae5..0db5cc223 100644
--- a/Source/charon/testcases/parser_test.h
+++ b/Source/charon/testcases/parser_test.h
@@ -105,4 +105,14 @@ void test_parser_with_auth_payload(tester_t *tester);
  */
 void test_parser_with_ts_payload(tester_t *tester);
 
+/**
+ * @brief Test function used to test the parser_t functionality when 
+ * parsing a CERT payload.
+ *
+ * @param tester 	associated tester_t object
+ * 
+ * @ingroup testcases
+ */
+void test_parser_with_cert_payload(tester_t *tester);
+
 #endif /*PARSER_TEST_H_*/
diff --git a/Source/charon/testcases/testcases.c b/Source/charon/testcases/testcases.c
index 03a318fcb..26c986258 100644
--- a/Source/charon/testcases/testcases.c
+++ b/Source/charon/testcases/testcases.c
@@ -89,6 +89,7 @@ test_t generator_test8 = {test_generator_with_nonce_payload,"Generator: Nonce Pa
 test_t generator_test9 = {test_generator_with_id_payload,"Generator: ID Payload"};
 test_t generator_test10 = {test_generator_with_auth_payload,"Generator: AUTH Payload"};
 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 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"};
@@ -97,6 +98,7 @@ test_t parser_test5 = {test_parser_with_notify_payload, "Parser: notify payload"
 test_t parser_test6 = {test_parser_with_id_payload, "Parser: ID payload"};
 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 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"};
@@ -186,6 +188,7 @@ int main()
 		&parser_test6,
 		&parser_test7,
 		&parser_test8,
+		&parser_test9,
 		&generator_test3,
 		&generator_test4,
 		&generator_test5,
@@ -195,6 +198,7 @@ int main()
 		&generator_test9,
 		&generator_test10,
 		&generator_test11,
+		&generator_test12,
 		&ike_sa_manager_test,
 		&packet_test,
 		&diffie_hellman_test,
@@ -225,8 +229,8 @@ int main()
 	tester_t *tester = tester_create(test_output, FALSE);
 	
 
-//	tester->perform_tests(tester,all_tests);
-	tester->perform_test(tester,&rsa_test); 
+	tester->perform_tests(tester,all_tests);
+//	tester->perform_test(tester,&parser_test9); 
 	
 	
 	tester->destroy(tester);