- implemented and tested cert_payload_t

Source/charon/encoding/generator.c

@@ -43,6 +43,7 @@
 #include <encoding/payloads/id_payload.h>
 #include <encoding/payloads/auth_payload.h>
 #include <encoding/payloads/cert_payload.h>
+#include <encoding/payloads/certreq_payload.h>
 #include <encoding/payloads/ts_payload.h>
 
 
@@ -744,7 +745,7 @@ static void generate_payload (private_generator_t *this,payload_t *payload)
 				u_int16_t int16_val = htons(length_of_ke_payload);			
 				this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),payload_length_position_offset);
 				break;
-			}		
+			}
 			case NOTIFICATION_DATA:
 			{
 				/* the Notification Data value is generated from chunk */
@@ -800,17 +801,30 @@ static void generate_payload (private_generator_t *this,payload_t *payload)
 			}
 			case CERT_DATA:
 			{
-				/* the AUTH Data value is generated from chunk */
+				/* the CERT Data value is generated from chunk */
 				this->generate_from_chunk(this, rules[i].offset);
 				
 				u_int32_t payload_length_position_offset = this->last_payload_length_position_offset;
-				/* Length of nonce PAYLOAD is calculated */
+				/* Length of PAYLOAD is calculated */
 				u_int16_t length_of_cert_payload = CERT_PAYLOAD_HEADER_LENGTH + ((chunk_t *)(this->data_struct + rules[i].offset))->len;
 				u_int16_t int16_val = htons(length_of_cert_payload);
 
 				this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),payload_length_position_offset);
 				break;
 			}
+			case CERTREQ_DATA:
+			{
+				/* the CERTREQ Data value is generated from chunk */
+				this->generate_from_chunk(this, rules[i].offset);
+				
+				u_int32_t payload_length_position_offset = this->last_payload_length_position_offset;
+				/* Length of PAYLOAD is calculated */
+				u_int16_t length_of_certreq_payload = CERTREQ_PAYLOAD_HEADER_LENGTH + ((chunk_t *)(this->data_struct + rules[i].offset))->len;
+				u_int16_t int16_val = htons(length_of_certreq_payload);
+
+				this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),payload_length_position_offset);
+				break;
+			}
 			case PROPOSALS:
 			{
 				/* before iterative generate the transforms, store the current payload length position */

Source/charon/encoding/parser.c

@@ -44,6 +44,7 @@
 #include <encoding/payloads/encryption_payload.h>
 #include <encoding/payloads/auth_payload.h>
 #include <encoding/payloads/cert_payload.h>
+#include <encoding/payloads/certreq_payload.h>
 #include <encoding/payloads/ts_payload.h>
 
 
@@ -838,6 +839,16 @@ static status_t parse_payload(private_parser_t *this, payload_type_t payload_typ
 				}		
 				break;			
 			}
+			case CERTREQ_DATA:
+			{
+				size_t data_length = payload_length - CERTREQ_PAYLOAD_HEADER_LENGTH;
+				if (this->parse_chunk(this, rule_number, output + rule->offset, data_length) != SUCCESS) 
+				{
+					pld->destroy(pld);
+					return PARSE_ERROR;
+				}		
+				break;			
+			}
 			case KEY_EXCHANGE_DATA:
 			{
 				size_t keydata_length = payload_length - KE_PAYLOAD_HEADER_LENGTH;

Source/charon/encoding/payloads/Makefile.payloads

@@ -46,6 +46,9 @@ OBJS+= $(BUILD_DIR)cert_payload.o
 $(BUILD_DIR)cert_payload.o :			$(PAYLOADS_DIR)cert_payload.c $(PAYLOADS_DIR)cert_payload.h
 										$(CC) $(CFLAGS) -c -o $@ $<
 
+OBJS+= $(BUILD_DIR)certreq_payload.o
+$(BUILD_DIR)certreq_payload.o :			$(PAYLOADS_DIR)certreq_payload.c $(PAYLOADS_DIR)certreq_payload.h
+										$(CC) $(CFLAGS) -c -o $@ $<
 OBJS+= $(BUILD_DIR)ts_payload.o
 $(BUILD_DIR)ts_payload.o :				$(PAYLOADS_DIR)ts_payload.c $(PAYLOADS_DIR)ts_payload.h
 										$(CC) $(CFLAGS) -c -o $@ $<

Source/charon/encoding/payloads/encodings.c

@@ -54,5 +54,7 @@ mapping_t encoding_type_m[] = {
 	{TS_TYPE, "TS_TYPE"},
 	{ADDRESS, "ADDRESS"},
 	{TRAFFIC_SELECTORS, "TRAFFIC_SELECTORS"},
+	{CERT_DATA, "CERT_DATA"},
+	{CERTREQ_DATA, "CERTREQ_DATA"},
 	{MAPPING_END, NULL}
 };

Source/charon/encoding/payloads/encodings.h

@@ -378,6 +378,16 @@ enum encoding_type_t{
 	 */
 	CERT_DATA,
 
+	/**
+	 * Representating a CERTREQ Data field.
+	 * 
+ 	 * When generating the content of the chunkt pointing to 
+ 	 * is written.
+	 * 
+	 * When parsing (Payload Length - 5) bytes are read and written into the chunk pointing to.
+	 */
+	CERTREQ_DATA,
+
 	/**
 	 * Representating an IKE_SPI field in an IKEv2 Header.
 	 * 

Source/charon/encoding/payloads/payload.c

@@ -32,6 +32,7 @@
 #include <encoding/payloads/notify_payload.h>
 #include <encoding/payloads/auth_payload.h>
 #include <encoding/payloads/cert_payload.h>
+#include <encoding/payloads/certreq_payload.h>
 #include <encoding/payloads/encryption_payload.h>
 #include <encoding/payloads/ts_payload.h>
 
@@ -91,6 +92,8 @@ payload_t *payload_create(payload_type_t type)
 			return (payload_t*)auth_payload_create();
 		case CERTIFICATE:
 			return (payload_t*)cert_payload_create();
+		case CERTIFICATE_REQUEST:
+			return (payload_t*)certreq_payload_create();
 		case TRAFFIC_SELECTOR_SUBSTRUCTURE:
 			return (payload_t*)traffic_selector_substructure_create();
 		case TRAFFIC_SELECTOR_INITIATOR:

Source/charon/testcases/generator_test.c

@@ -41,6 +41,7 @@
 #include <encoding/payloads/id_payload.h>
 #include <encoding/payloads/auth_payload.h>
 #include <encoding/payloads/cert_payload.h>
+#include <encoding/payloads/certreq_payload.h>
 #include <encoding/payloads/ts_payload.h>
 
 /*
@@ -1053,58 +1054,6 @@ void test_generator_with_auth_payload(tester_t *tester)
 	charon->logger_manager->destroy_logger(charon->logger_manager,logger);	
 }
 
-/*
- * 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.
  */ 
@@ -1188,3 +1137,107 @@ void test_generator_with_ts_payload(tester_t *tester)
 		
 	charon->logger_manager->destroy_logger(charon->logger_manager,logger);	
 }
+
+/*
+ * 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_certreq_payload(tester_t *tester)
+{
+	generator_t *generator;
+	certreq_payload_t *certreq_payload;
+	logger_t *logger;
+	chunk_t generated_data;
+	chunk_t certreq;
+	
+	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");
+	
+	certreq_payload = certreq_payload_create();
+	
+	
+	certreq.ptr = "123456789012";
+	certreq.len = strlen(certreq.ptr);
+
+	certreq_payload->set_cert_encoding(certreq_payload,PGP_CERTIFICATE);
+	certreq_payload->set_data(certreq_payload,certreq);
+	
+	generator->generate_payload(generator,(payload_t *)certreq_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,
+		/* certreq 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);
+	
+	certreq_payload->destroy(certreq_payload);
+	generator->destroy(generator);
+		
+	charon->logger_manager->destroy_logger(charon->logger_manager,logger);	
+}

Source/charon/testcases/generator_test.h

@@ -116,15 +116,6 @@ 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.
  * 
@@ -134,5 +125,24 @@ void test_generator_with_cert_payload(tester_t *tester);
  */
 void test_generator_with_ts_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 CERTREQ payload.
+ * 
+ * @param tester associated tester_t object
+ * 
+ * @ingroup testcases
+ */
+void test_generator_with_certreq_payload(tester_t *tester);
+
 
 #endif /*GENERATOR_TEST_H_*/

Source/charon/testcases/parser_test.c

@@ -37,6 +37,7 @@
 #include <encoding/payloads/notify_payload.h>
 #include <encoding/payloads/auth_payload.h>
 #include <encoding/payloads/cert_payload.h>
+#include <encoding/payloads/certreq_payload.h>
 #include <encoding/payloads/ts_payload.h>
 
 
@@ -732,3 +733,42 @@ void test_parser_with_cert_payload(tester_t *tester)
 	allocator_free_chunk(&result);
 }
 
+/*
+ * Described in Header 
+ */
+void test_parser_with_certreq_payload(tester_t *tester)
+{
+	parser_t *parser;
+	certreq_payload_t *certreq_payload;
+	status_t status;
+	chunk_t certreq_chunk, result;
+	
+	u_int8_t certreq_bytes[] = {
+		0x00,0x00,0x00,0x11, /* payload header */
+		0x03,
+			0x04,0x05,0x06,0x07,/* 12 Byte data */
+			0x08,0x09,0x0A,0x2B,
+			0x0C,0x0D,0x0E,0x0F
+	};
+	
+	certreq_chunk.ptr = certreq_bytes;
+	certreq_chunk.len = sizeof(certreq_bytes);
+
+	parser = parser_create(certreq_chunk);
+	tester->assert_true(tester,(parser != NULL), "parser create check");
+	status = parser->parse_payload(parser, CERTIFICATE_REQUEST, (payload_t**)&certreq_payload);
+	tester->assert_true(tester,(status == SUCCESS),"parse_payload call check");
+	parser->destroy(parser);
+	
+	if (status != SUCCESS)
+	{
+		return;	
+	}
+	result = certreq_payload->get_data_clone(certreq_payload);
+	tester->assert_true(tester,(certreq_payload->get_cert_encoding(certreq_payload) == DNS_SIGNED_KEY), "is DNS_SIGNED_KEY encoding");
+	tester->assert_true(tester,(result.len == 12), "parsed data lenght");
+	tester->assert_false(tester,(memcmp(certreq_bytes + 5, result.ptr, result.len)), "parsed data");
+	certreq_payload->destroy(certreq_payload);
+	allocator_free_chunk(&result);
+}
+

Source/charon/testcases/parser_test.h

@@ -115,4 +115,14 @@ void test_parser_with_ts_payload(tester_t *tester);
  */
 void test_parser_with_cert_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_certreq_payload(tester_t *tester);
+
 #endif /*PARSER_TEST_H_*/

Source/charon/testcases/testcases.c

@@ -90,6 +90,7 @@ 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 generator_test13 = {test_generator_with_certreq_payload,"Generator: CERTREQ 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"};
@@ -99,6 +100,7 @@ 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 parser_test10 = {test_parser_with_certreq_payload, "Parser: CERTREQ 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"};
@@ -189,6 +191,7 @@ int main()
 		&parser_test7,
 		&parser_test8,
 		&parser_test9,
+		&parser_test10,
 		&generator_test3,
 		&generator_test4,
 		&generator_test5,
@@ -199,6 +202,7 @@ int main()
 		&generator_test10,
 		&generator_test11,
 		&generator_test12,
+		&generator_test13,
 		&ike_sa_manager_test,
 		&packet_test,
 		&diffie_hellman_test,
@@ -229,8 +233,8 @@ int main()
 	tester_t *tester = tester_create(test_output, FALSE);
 	
 
-	tester->perform_tests(tester,all_tests);
+//	tester->perform_tests(tester,all_tests);
-//	tester->perform_test(tester,&parser_test9); 
+	tester->perform_test(tester,&generator_test13); 
 	
 	
 	tester->destroy(tester);