encrypted_payload: Expose generate() to generate the plaintext

src/libcharon/encoding/payloads/encrypted_payload.c

@@ -24,7 +24,6 @@
 #include <daemon.h>
 #include <encoding/payloads/encodings.h>
 #include <collections/linked_list.h>
-#include <encoding/generator.h>
 #include <encoding/parser.h>
 
 typedef struct private_encrypted_payload_t private_encrypted_payload_t;
@@ -298,6 +297,12 @@ static chunk_t generate(private_encrypted_payload_t *this,
 	return chunk;
 }
 
+METHOD(encrypted_payload_t, generate_payloads, void,
+	private_encrypted_payload_t *this, generator_t *generator)
+{
+	generate(this, generator);
+}
+
 /**
  * Append the encrypted payload header to the associated data
  */
@@ -646,6 +651,7 @@ encrypted_payload_t *encrypted_payload_create(payload_type_t type)
 			.get_length = _get_length,
 			.add_payload = _add_payload,
 			.remove_payload = _remove_payload,
+			.generate_payloads = _generate_payloads,
 			.set_transform = _set_transform,
 			.encrypt = _encrypt,
 			.decrypt = _decrypt,

src/libcharon/encoding/payloads/encrypted_payload.h

@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2014 Tobias Brunner
  * Copyright (C) 2005-2010 Martin Willi
  * Copyright (C) 2010 revosec AG
  * Copyright (C) 2005 Jan Hutter
@@ -28,6 +29,7 @@ typedef struct encrypted_payload_t encrypted_payload_t;
 #include <library.h>
 #include <crypto/aead.h>
 #include <encoding/payloads/payload.h>
+#include <encoding/generator.h>
 
 /**
  * The encrypted payload as described in RFC section 3.14.
@@ -61,6 +63,14 @@ struct encrypted_payload_t {
 	 */
 	payload_t* (*remove_payload)(encrypted_payload_t *this);
 
+	/**
+	 * Uses the given generator to generate the contained payloads.
+	 *
+	 * @param generator		generator used to generate the contained payloads
+	 */
+	void (*generate_payloads)(encrypted_payload_t *this,
+							  generator_t *generator);
+
 	/**
 	 * Set the AEAD transform to use.
 	 *