- nonce payload tested

- generator for nonce data written

Source/charon/generator.c

@@ -38,6 +38,7 @@
 #include "payloads/sa_payload.h"
 #include "payloads/ke_payload.h"
 #include "payloads/notify_payload.h"
+#include "payloads/nonce_payload.h"
 
 extern logger_manager_t *global_logger_manager;
 
@@ -786,6 +787,29 @@ static status_t generate_payload (private_generator_t *this,payload_t *payload)
 				}
 				break;
 			}		
+			case NONCE_DATA:
+			{
+				/* the Nonce Data value is generated from chunk */
+				status = this->generate_from_chunk(this,rules[i].offset);
+				if (status != SUCCESS)
+				{
+					this->logger->log(this->logger,CONTROL_MORE,"Could no write nonce data from chunk");	
+					return status;
+				}
+				
+				u_int32_t payload_length_position_offset = this->last_payload_length_position_offset;
+				/* Length of nonce PAYLOAD is calculated */
+				u_int16_t length_of_nonce_payload = NONCE_PAYLOAD_HEADER_LENGTH + ((chunk_t *)(this->data_struct + rules[i].offset))->len;
+				u_int16_t int16_val = htons(length_of_nonce_payload);
+
+				status = this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),payload_length_position_offset);
+				if (status != SUCCESS)
+				{
+					this->logger->log(this->logger,CONTROL_MORE,"Could no write payload length into buffer");					
+					return status;
+				}
+				break;
+			}
 			case PROPOSALS:
 			{
 				/* before iterative generate the transforms, store the current payload length position */

Source/charon/payloads/nonce_payload.c

@@ -100,11 +100,6 @@ encoding_rule_t nonce_payload_encodings[] = {
 	{ NONCE_DATA,			offsetof(private_nonce_payload_t, nonce) 		}
 };
 
-/**
- * length of a nonce payload without a nonce in int
- */
-#define NONCE_PAYLOAD_HEADER_LENGTH 4
-
 /**
  * Implements payload_t's and nonce_payload_t's destroy function.
  * See #payload_s.destroy or nonce_payload_s.destroy for description.
@@ -229,6 +224,8 @@ nonce_payload_t *nonce_payload_create()
 	this->critical = FALSE;
 	this->next_payload = NO_PAYLOAD;
 	this->payload_length = NONCE_PAYLOAD_HEADER_LENGTH;
+	this->nonce.ptr = NULL;
+	this->nonce.len = 0;
 
 	return (&(this->public));
 }

Source/charon/payloads/nonce_payload.h

@@ -28,7 +28,10 @@
 #include "../types.h"
 #include "payload.h"
 
-
+/**
+ * length of a nonce payload without a nonce in int
+ */
+#define NONCE_PAYLOAD_HEADER_LENGTH 4
 
 /**
  * Object representing an IKEv2 Nonce payload

Source/charon/testcases/generator_test.c

@@ -37,6 +37,7 @@
 #include "../payloads/sa_payload.h"
 #include "../payloads/ke_payload.h"
 #include "../payloads/notify_payload.h"
+#include "../payloads/nonce_payload.h"
 
 /*
  * Described in Header 
@@ -735,3 +736,58 @@ void test_generator_with_notify_payload(tester_t *tester)
 	global_logger_manager->destroy_logger(global_logger_manager,logger);	
 	
 }
+
+/*
+ * Described in header
+ */ 
+void test_generator_with_nonce_payload(tester_t *tester)
+{
+	generator_t *generator;
+	nonce_payload_t *nonce_payload;
+	logger_t *logger;
+	status_t status;
+	chunk_t generated_data;
+	chunk_t nonce;
+	
+	logger = global_logger_manager->create_logger(global_logger_manager,TESTER,"Message with Nonce Payload");
+	
+	/* create generator */
+	generator = generator_create();
+	tester->assert_true(tester,(generator != NULL), "generator create check");
+	
+	nonce_payload = nonce_payload_create();
+	
+	
+	nonce.ptr = "1234567890123456";
+	nonce.len = strlen(nonce.ptr);
+
+	nonce_payload->set_nonce(nonce_payload,nonce);
+	
+	status = generator->generate_payload(generator,(payload_t *)nonce_payload);
+	tester->assert_true(tester,(status == SUCCESS),"generate_payload call check");
+	tester->assert_true(tester,(generator->write_to_chunk(generator,&generated_data) == SUCCESS),"write_to_chunk call check");
+	logger->log_chunk(logger,RAW,"generated payload",&generated_data);	
+
+	u_int8_t expected_generation[] = {
+		/* payload header */
+		0x00,0x00,0x00,0x14,
+		/* nonce data */
+		0x31,0x32,0x33,0x34,
+		0x35,0x36,0x37,0x38,
+		0x39,0x30,0x31,0x32,
+		0x33,0x34,0x35,0x36
+	};
+	
+	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);	
+	
+	tester->assert_true(tester,(nonce_payload->destroy(nonce_payload) == SUCCESS), "notify_payload destroy call check");
+	tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check");
+		
+	global_logger_manager->destroy_logger(global_logger_manager,logger);	
+	
+}
+

Source/charon/testcases/generator_test.h

@@ -82,5 +82,13 @@ void test_generator_with_ke_payload(tester_t *tester);
  */
 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
+ */
+void test_generator_with_nonce_payload(tester_t *tester);
+
 
 #endif /*GENERATOR_TEST_H_*/

Source/charon/testcases/testcases.c

@@ -128,6 +128,7 @@ test_t generator_test4 = {test_generator_with_proposal_substructure,"Generator:
 test_t generator_test5 = {test_generator_with_sa_payload,"Generator: Message with SA Payload"};
 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"};
 
 
 /**
@@ -212,6 +213,7 @@ logger_manager_t *global_logger_manager;
 	&generator_test5,
 	&generator_test6,
 	&generator_test7,
+	&generator_test8,
 	&ike_sa_manager_test,
 	&packet_test,
 	NULL
@@ -228,8 +230,8 @@ logger_manager_t *global_logger_manager;
  	 	
  	tester_t *tester = tester_create(test_output, FALSE);
 
-	tester->perform_tests(tester,all_tests);
+//	tester->perform_tests(tester,all_tests);
-//	tester->perform_test(tester,&generator_test7); 
+	tester->perform_test(tester,&generator_test8); 
 
  	
 	tester->destroy(tester);