5 files changed, 116 insertions, 0 deletions

diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c
index b3faa9966..d53a8e7ce 100644
--- a/Source/charon/testcases/generator_test.c
+++ b/Source/charon/testcases/generator_test.c
@@ -39,6 +39,7 @@
 #include <encoding/payloads/notify_payload.h>
 #include <encoding/payloads/nonce_payload.h>
 #include <encoding/payloads/id_payload.h>
+#include <encoding/payloads/auth_payload.h>
 
 /*
  * Described in Header 
@@ -785,3 +786,55 @@ void test_generator_with_id_payload(tester_t *tester)
 	charon->logger_manager->destroy_logger(charon->logger_manager,logger);	
 }
 
+/*
+ * Described in header.
+ */ 
+void test_generator_with_auth_payload(tester_t *tester)
+{
+	generator_t *generator;
+	auth_payload_t *auth_payload;
+	logger_t *logger;
+	chunk_t generated_data;
+	chunk_t auth;
+	
+	logger = charon->logger_manager->create_logger(charon->logger_manager,TESTER,"Message with AUTH Payload");
+	
+	/* create generator */
+	generator = generator_create();
+	tester->assert_true(tester,(generator != NULL), "generator create check");
+	
+	auth_payload = auth_payload_create(FALSE);
+	
+	
+	auth.ptr = "123456789012";
+	auth.len = strlen(auth.ptr);
+
+	auth_payload->set_auth_method(auth_payload,SHARED_KEY_MESSAGE_INTEGRITY_CODE);
+	auth_payload->set_data(auth_payload,auth);
+	
+	generator->generate_payload(generator,(payload_t *)auth_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,0x00,0x00,0x00,
+		/* auth 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);
+	
+	auth_payload->destroy(auth_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 02b050fd8..c0f2a6206 100644
--- a/Source/charon/testcases/generator_test.h
+++ b/Source/charon/testcases/generator_test.h
@@ -107,5 +107,14 @@ void test_generator_with_nonce_payload(tester_t *tester);
  */
 void test_generator_with_id_payload(tester_t *tester);
 
+/**
+ * @brief Test function used to test the generator with AUTH payload.
+ * 
+ * @param tester associated tester_t object
+ * 
+ * @ingroup testcases
+ */
+void test_generator_with_auth_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 928d96959..f07773504 100644
--- a/Source/charon/testcases/parser_test.c
+++ b/Source/charon/testcases/parser_test.c
@@ -35,6 +35,7 @@
 #include <encoding/payloads/id_payload.h>
 #include <encoding/payloads/ke_payload.h>
 #include <encoding/payloads/notify_payload.h>
+#include <encoding/payloads/auth_payload.h>
 
 
 
@@ -345,3 +346,42 @@ void test_parser_with_notify_payload(tester_t *tester)
 	
 	notify_payload->destroy(notify_payload);
 }
+
+/*
+ * Described in Header 
+ */
+void test_parser_with_auth_payload(tester_t *tester)
+{
+	parser_t *parser;
+	auth_payload_t *auth_payload;
+	status_t status;
+	chunk_t auth_chunk, result;
+	
+	u_int8_t auth_bytes[] = {
+		0x00,0x00,0x00,0x14, /* payload header */
+		0x03,0x01,0x02,0x03,
+			0x04,0x05,0x06,0x07,/* 12 Byte nonce */
+			0x08,0x09,0x0A,0x2B,
+			0x0C,0x0D,0x0E,0x0F
+	};
+	
+	auth_chunk.ptr = auth_bytes;
+	auth_chunk.len = sizeof(auth_bytes);
+
+	parser = parser_create(auth_chunk);
+	tester->assert_true(tester,(parser != NULL), "parser create check");
+	status = parser->parse_payload(parser, AUTHENTICATION, (payload_t**)&auth_payload);
+	tester->assert_true(tester,(status == SUCCESS),"parse_payload call check");
+	parser->destroy(parser);
+	
+	if (status != SUCCESS)
+	{
+		return;	
+	}
+	result = auth_payload->get_data(auth_payload);
+	tester->assert_true(tester,(auth_payload->get_auth_method(auth_payload) == DSS_DIGITAL_SIGNATURE), "is DSS_DIGITAL_SIGNATURE method");
+	tester->assert_true(tester,(result.len == 12), "parsed data lenght");
+	tester->assert_false(tester,(memcmp(auth_bytes + 8, result.ptr, result.len)), "parsed nonce data");
+	auth_payload->destroy(auth_payload);
+	allocator_free_chunk(&result);
+}
diff --git a/Source/charon/testcases/parser_test.h b/Source/charon/testcases/parser_test.h
index a80888fe8..e25e0356d 100644
--- a/Source/charon/testcases/parser_test.h
+++ b/Source/charon/testcases/parser_test.h
@@ -85,4 +85,14 @@ void test_parser_with_ke_payload(tester_t *tester);
  */
 void test_parser_with_notify_payload(tester_t *tester);
 
+/**
+ * @brief Test function used to test the parser_t functionality when 
+ * parsing a AUTH payload.
+ *
+ * @param tester 	associated tester_t object
+ * 
+ * @ingroup testcases
+ */
+void test_parser_with_auth_payload(tester_t *tester);
+
 #endif /*PARSER_TEST_H_*/
diff --git a/Source/charon/testcases/testcases.c b/Source/charon/testcases/testcases.c
index 9d5b2e00d..65af490c7 100644
--- a/Source/charon/testcases/testcases.c
+++ b/Source/charon/testcases/testcases.c
@@ -82,12 +82,14 @@ 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"};
+test_t generator_test10 = {test_generator_with_auth_payload,"Generator: AUTH 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"};
 test_t parser_test4 = {test_parser_with_ke_payload, "Parser: key exchange payload"};
 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 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"};
@@ -168,6 +170,7 @@ int main()
 		&parser_test4,
 		&parser_test5,
 		&parser_test6,
+		&parser_test7,
 		&generator_test3,
 		&generator_test4,
 		&generator_test5,
@@ -175,6 +178,7 @@ int main()
 		&generator_test7,
 		&generator_test8,
 		&generator_test9,
+		&generator_test10,
 		&ike_sa_manager_test,
 		&packet_test,
 		&diffie_hellman_test,