Fixed merge, don't know why this didn't happen automatically - maybe a leftover from the svn->git conversion

1 files changed, 131 insertions, 0 deletions

diff --git a/src/libcharon/encoding/payloads/certreq_payload.c b/src/libcharon/encoding/payloads/certreq_payload.c
index 9ff0bdde0..0c59fd66d 100644
--- a/src/libcharon/encoding/payloads/certreq_payload.c
+++ b/src/libcharon/encoding/payloads/certreq_payload.c
@@ -1,5 +1,10 @@
 /*
+<<<<<<< HEAD
  * Copyright (C) 2005-2006 Martin Willi
+=======
+ * Copyright (C) 2005-2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
+>>>>>>> upstream/4.5.1
  * Copyright (C) 2005 Jan Hutter
  * Hochschule fuer Technik Rapperswil
  *
@@ -22,14 +27,23 @@
 
 #include "certreq_payload.h"
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> upstream/4.5.1
 typedef struct private_certreq_payload_t private_certreq_payload_t;
 
 /**
  * Private data of an certreq_payload_t object.
+<<<<<<< HEAD
  *
  */
 struct private_certreq_payload_t {
+=======
+ */
+struct private_certreq_payload_t {
+
+>>>>>>> upstream/4.5.1
 	/**
 	 * Public certreq_payload_t interface.
 	 */
@@ -46,6 +60,14 @@ struct private_certreq_payload_t {
 	bool critical;
 
 	/**
+<<<<<<< HEAD
+=======
+	 * Reserved bits
+	 */
+	bool reserved[7];
+
+	/**
+>>>>>>> upstream/4.5.1
 	 * Length of this payload.
 	 */
 	u_int16_t payload_length;
@@ -66,6 +88,7 @@ struct private_certreq_payload_t {
  *
  * The defined offsets are the positions in a object of type
  * private_certreq_payload_t.
+<<<<<<< HEAD
  *
  */
 encoding_rule_t certreq_payload_encodings[] = {
@@ -81,6 +104,22 @@ encoding_rule_t certreq_payload_encodings[] = {
 	{ RESERVED_BIT,	0 														},
 	{ RESERVED_BIT,	0 														},
 	{ RESERVED_BIT,	0 														},
+=======
+ */
+encoding_rule_t certreq_payload_encodings[] = {
+	/* 1 Byte next payload type, stored in the field next_payload */
+	{ U_INT_8,			offsetof(private_certreq_payload_t, next_payload)	},
+	/* the critical bit */
+	{ FLAG,				offsetof(private_certreq_payload_t, critical)		},
+	/* 7 Bit reserved bits */
+	{ RESERVED_BIT,		offsetof(private_certreq_payload_t, reserved[0])	},
+	{ RESERVED_BIT,		offsetof(private_certreq_payload_t, reserved[1])	},
+	{ RESERVED_BIT,		offsetof(private_certreq_payload_t, reserved[2])	},
+	{ RESERVED_BIT,		offsetof(private_certreq_payload_t, reserved[3])	},
+	{ RESERVED_BIT,		offsetof(private_certreq_payload_t, reserved[4])	},
+	{ RESERVED_BIT,		offsetof(private_certreq_payload_t, reserved[5])	},
+	{ RESERVED_BIT,		offsetof(private_certreq_payload_t, reserved[6])	},
+>>>>>>> upstream/4.5.1
 	/* Length of the whole payload*/
 	{ PAYLOAD_LENGTH,	offsetof(private_certreq_payload_t, payload_length)	},
 	/* 1 Byte CERTREQ type*/
@@ -102,10 +141,15 @@ encoding_rule_t certreq_payload_encodings[] = {
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 */
 
+<<<<<<< HEAD
 /**
  * Implementation of payload_t.verify.
  */
 static status_t verify(private_certreq_payload_t *this)
+=======
+METHOD(payload_t, verify, status_t,
+	private_certreq_payload_t *this)
+>>>>>>> upstream/4.5.1
 {
 	if (this->encoding == ENC_X509_SIGNATURE)
 	{
@@ -120,6 +164,7 @@ static status_t verify(private_certreq_payload_t *this)
 	return SUCCESS;
 }
 
+<<<<<<< HEAD
 /**
  * Implementation of certreq_payload_t.get_encoding_rules.
  */
@@ -133,10 +178,22 @@ static void get_encoding_rules(private_certreq_payload_t *this, encoding_rule_t
  * Implementation of payload_t.get_type.
  */
 static payload_type_t get_payload_type(private_certreq_payload_t *this)
+=======
+METHOD(payload_t, get_encoding_rules, void,
+	private_certreq_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
+{
+	*rules = certreq_payload_encodings;
+	*rule_count = countof(certreq_payload_encodings);
+}
+
+METHOD(payload_t, get_type, payload_type_t,
+	private_certreq_payload_t *this)
+>>>>>>> upstream/4.5.1
 {
 	return CERTIFICATE_REQUEST;
 }
 
+<<<<<<< HEAD
 /**
  * Implementation of payload_t.get_next_type.
  */
@@ -149,22 +206,42 @@ static payload_type_t get_next_type(private_certreq_payload_t *this)
  * Implementation of payload_t.set_next_type.
  */
 static void set_next_type(private_certreq_payload_t *this,payload_type_t type)
+=======
+METHOD(payload_t, get_next_type, payload_type_t,
+	private_certreq_payload_t *this)
+{
+	return this->next_payload;
+}
+
+METHOD(payload_t, set_next_type, void,
+	private_certreq_payload_t *this, payload_type_t type)
+>>>>>>> upstream/4.5.1
 {
 	this->next_payload = type;
 }
 
+<<<<<<< HEAD
 /**
  * Implementation of payload_t.get_length.
  */
 static size_t get_length(private_certreq_payload_t *this)
+=======
+METHOD(payload_t, get_length, size_t,
+	private_certreq_payload_t *this)
+>>>>>>> upstream/4.5.1
 {
 	return this->payload_length;
 }
 
+<<<<<<< HEAD
 /**
  * Implementation of certreq_payload_t.add_keyid.
  */
 static void add_keyid(private_certreq_payload_t *this, chunk_t keyid)
+=======
+METHOD(certreq_payload_t, add_keyid, void,
+	private_certreq_payload_t *this, chunk_t keyid)
+>>>>>>> upstream/4.5.1
 {
 	this->data = chunk_cat("mc", this->data, keyid);
 	this->payload_length += keyid.len;
@@ -181,10 +258,15 @@ struct keyid_enumerator_t  {
 	u_char *pos;
 };
 
+<<<<<<< HEAD
 /**
  * enumerate function for keyid_enumerator
  */
 static bool keyid_enumerate(keyid_enumerator_t *this, chunk_t *chunk)
+=======
+METHOD(enumerator_t, keyid_enumerate, bool,
+	keyid_enumerator_t *this, chunk_t *chunk)
+>>>>>>> upstream/4.5.1
 {
 	if (this->pos == NULL)
 	{
@@ -207,6 +289,7 @@ static bool keyid_enumerate(keyid_enumerator_t *this, chunk_t *chunk)
 	return FALSE;
 }
 
+<<<<<<< HEAD
 /**
  * Implementation of certreq_payload_t.create_keyid_enumerator.
  */
@@ -224,6 +307,25 @@ static enumerator_t* create_keyid_enumerator(private_certreq_payload_t *this)
  * Implementation of certreq_payload_t.get_cert_type.
  */
 static certificate_type_t get_cert_type(private_certreq_payload_t *this)
+=======
+METHOD(certreq_payload_t, create_keyid_enumerator, enumerator_t*,
+	private_certreq_payload_t *this)
+{
+	keyid_enumerator_t *enumerator;
+
+	INIT(enumerator,
+		.public = {
+			.enumerate = (void*)_keyid_enumerate,
+			.destroy = (void*)free,
+		},
+		.full = this->data,
+	);
+	return &enumerator->public;
+}
+
+METHOD(certreq_payload_t, get_cert_type, certificate_type_t,
+	private_certreq_payload_t *this)
+>>>>>>> upstream/4.5.1
 {
 	switch (this->encoding)
 	{
@@ -234,10 +336,15 @@ static certificate_type_t get_cert_type(private_certreq_payload_t *this)
 	}
 }
 
+<<<<<<< HEAD
 /**
  * Implementation of payload_t.destroy and certreq_payload_t.destroy.
  */
 static void destroy(private_certreq_payload_t *this)
+=======
+METHOD2(payload_t, certreq_payload_t, destroy, void,
+	private_certreq_payload_t *this)
+>>>>>>> upstream/4.5.1
 {
 	chunk_free(&this->data);
 	free(this);
@@ -248,6 +355,7 @@ static void destroy(private_certreq_payload_t *this)
  */
 certreq_payload_t *certreq_payload_create()
 {
+<<<<<<< HEAD
 	private_certreq_payload_t *this = malloc_thing(private_certreq_payload_t);
 
 	/* interface functions */
@@ -272,6 +380,29 @@ certreq_payload_t *certreq_payload_create()
 	this->data = chunk_empty;
 	this->encoding = 0;
 
+=======
+	private_certreq_payload_t *this;
+
+	INIT(this,
+		.public = {
+			.payload_interface = {
+				.verify = _verify,
+				.get_encoding_rules = _get_encoding_rules,
+				.get_length = _get_length,
+				.get_next_type = _get_next_type,
+				.set_next_type = _set_next_type,
+				.get_type = _get_type,
+				.destroy = _destroy,
+			},
+			.create_keyid_enumerator = _create_keyid_enumerator,
+			.get_cert_type = _get_cert_type,
+			.add_keyid = _add_keyid,
+			.destroy = _destroy,
+		},
+		.next_payload = NO_PAYLOAD,
+		.payload_length = CERTREQ_PAYLOAD_HEADER_LENGTH,
+	);
+>>>>>>> upstream/4.5.1
 	return &this->public;
 }