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

1 files changed, 133 insertions, 0 deletions

diff --git a/src/libcharon/encoding/payloads/ke_payload.c b/src/libcharon/encoding/payloads/ke_payload.c
index 1bc79f084..dd239b212 100644
--- a/src/libcharon/encoding/payloads/ke_payload.c
+++ b/src/libcharon/encoding/payloads/ke_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
  *
@@ -20,14 +25,23 @@
 
 #include <encoding/payloads/encodings.h>
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> upstream/4.5.1
 typedef struct private_ke_payload_t private_ke_payload_t;
 
 /**
  * Private data of an ke_payload_t object.
+<<<<<<< HEAD
  *
  */
 struct private_ke_payload_t {
+=======
+ */
+struct private_ke_payload_t {
+
+>>>>>>> upstream/4.5.1
 	/**
 	 * Public ke_payload_t interface.
 	 */
@@ -44,6 +58,19 @@ struct private_ke_payload_t {
 	bool critical;
 
 	/**
+<<<<<<< HEAD
+=======
+	 * Reserved bits
+	 */
+	bool reserved_bit[7];
+
+	/**
+	 * Reserved bytes
+	 */
+	u_int8_t reserved_byte[2];
+
+	/**
+>>>>>>> upstream/4.5.1
 	 * Length of this payload.
 	 */
 	u_int16_t payload_length;
@@ -64,6 +91,7 @@ struct private_ke_payload_t {
  *
  * The defined offsets are the positions in a object of type
  * private_ke_payload_t.
+<<<<<<< HEAD
  *
  */
 encoding_rule_t ke_payload_encodings[] = {
@@ -85,6 +113,29 @@ encoding_rule_t ke_payload_encodings[] = {
 	{ U_INT_16,			offsetof(private_ke_payload_t, dh_group_number) 	},
 	{ RESERVED_BYTE,	0 													},
 	{ RESERVED_BYTE,	0 													},
+=======
+ */
+encoding_rule_t ke_payload_encodings[] = {
+	/* 1 Byte next payload type, stored in the field next_payload */
+	{ U_INT_8,				offsetof(private_ke_payload_t, next_payload)	},
+	/* the critical bit */
+	{ FLAG,					offsetof(private_ke_payload_t, critical)		},
+	/* 7 Bit reserved bits */
+	{ RESERVED_BIT,			offsetof(private_ke_payload_t, reserved_bit[0])	},
+	{ RESERVED_BIT,			offsetof(private_ke_payload_t, reserved_bit[1])	},
+	{ RESERVED_BIT,			offsetof(private_ke_payload_t, reserved_bit[2])	},
+	{ RESERVED_BIT,			offsetof(private_ke_payload_t, reserved_bit[3])	},
+	{ RESERVED_BIT,			offsetof(private_ke_payload_t, reserved_bit[4])	},
+	{ RESERVED_BIT,			offsetof(private_ke_payload_t, reserved_bit[5])	},
+	{ RESERVED_BIT,			offsetof(private_ke_payload_t, reserved_bit[6])	},
+	/* Length of the whole payload*/
+	{ PAYLOAD_LENGTH,		offsetof(private_ke_payload_t, payload_length)	},
+	/* DH Group number as 16 bit field*/
+	{ U_INT_16,				offsetof(private_ke_payload_t, dh_group_number)	},
+	/* 2 reserved bytes */
+	{ RESERVED_BYTE,		offsetof(private_ke_payload_t, reserved_byte[0])},
+	{ RESERVED_BYTE,		offsetof(private_ke_payload_t, reserved_byte[1])},
+>>>>>>> upstream/4.5.1
 	/* Key Exchange Data is from variable size */
 	{ KEY_EXCHANGE_DATA,	offsetof(private_ke_payload_t, key_exchange_data)}
 };
@@ -103,6 +154,7 @@ encoding_rule_t ke_payload_encodings[] = {
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 */
 
+<<<<<<< HEAD
 /**
  * Implementation of payload_t.verify.
  */
@@ -137,10 +189,28 @@ static void get_encoding_rules(private_ke_payload_t *this, encoding_rule_t **rul
  * Implementation of payload_t.get_type.
  */
 static payload_type_t get_type(private_ke_payload_t *this)
+=======
+METHOD(payload_t, verify, status_t,
+	private_ke_payload_t *this)
+{
+	return SUCCESS;
+}
+
+METHOD(payload_t, get_encoding_rules, void,
+	private_ke_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
+{
+	*rules = ke_payload_encodings;
+	*rule_count = countof(ke_payload_encodings);
+}
+
+METHOD(payload_t, get_type, payload_type_t,
+	private_ke_payload_t *this)
+>>>>>>> upstream/4.5.1
 {
 	return KEY_EXCHANGE;
 }
 
+<<<<<<< HEAD
 /**
  * Implementation of payload_t.get_next_type.
  */
@@ -153,10 +223,21 @@ static payload_type_t get_next_type(private_ke_payload_t *this)
  * Implementation of payload_t.set_next_type.
  */
 static void set_next_type(private_ke_payload_t *this,payload_type_t type)
+=======
+METHOD(payload_t, get_next_type, payload_type_t,
+	private_ke_payload_t *this)
+{
+	return this->next_payload;
+}
+
+METHOD(payload_t, set_next_type, void,
+	private_ke_payload_t *this,payload_type_t type)
+>>>>>>> upstream/4.5.1
 {
 	this->next_payload = type;
 }
 
+<<<<<<< HEAD
 /**
  * recompute the length of the payload.
  */
@@ -210,16 +291,40 @@ static void set_key_exchange_data(private_ke_payload_t *this, chunk_t key_exchan
  * Implementation of ke_payload_t.get_dh_group_number.
  */
 static diffie_hellman_group_t get_dh_group_number(private_ke_payload_t *this)
+=======
+METHOD(payload_t, get_length, size_t,
+	private_ke_payload_t *this)
+{
+	return this->payload_length;
+}
+
+METHOD(ke_payload_t, get_key_exchange_data, chunk_t,
+	private_ke_payload_t *this)
+{
+	return this->key_exchange_data;
+}
+
+METHOD(ke_payload_t, get_dh_group_number, diffie_hellman_group_t,
+	private_ke_payload_t *this)
+>>>>>>> upstream/4.5.1
 {
 	return this->dh_group_number;
 }
 
+<<<<<<< HEAD
 /**
  * Implementation of ke_payload_t.set_dh_group_number.
  */
 static void set_dh_group_number(private_ke_payload_t *this, diffie_hellman_group_t dh_group_number)
 {
 	this->dh_group_number = dh_group_number;
+=======
+METHOD2(payload_t, ke_payload_t, destroy, void,
+	private_ke_payload_t *this)
+{
+	free(this->key_exchange_data.ptr);
+	free(this);
+>>>>>>> upstream/4.5.1
 }
 
 /*
@@ -227,6 +332,7 @@ static void set_dh_group_number(private_ke_payload_t *this, diffie_hellman_group
  */
 ke_payload_t *ke_payload_create()
 {
+<<<<<<< HEAD
 	private_ke_payload_t *this = malloc_thing(private_ke_payload_t);
 
 	/* interface functions */
@@ -252,6 +358,29 @@ ke_payload_t *ke_payload_create()
 	this->key_exchange_data = chunk_empty;
 	this->dh_group_number = MODP_NONE;
 
+=======
+	private_ke_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,
+			},
+			.get_key_exchange_data = _get_key_exchange_data,
+			.get_dh_group_number = _get_dh_group_number,
+			.destroy = _destroy,
+		},
+		.next_payload = NO_PAYLOAD,
+		.payload_length = KE_PAYLOAD_HEADER_LENGTH,
+		.dh_group_number = MODP_NONE,
+	);
+>>>>>>> upstream/4.5.1
 	return &this->public;
 }
 
@@ -264,7 +393,11 @@ ke_payload_t *ke_payload_create_from_diffie_hellman(diffie_hellman_t *dh)
 
 	dh->get_my_public_value(dh, &this->key_exchange_data);
 	this->dh_group_number = dh->get_dh_group(dh);
+<<<<<<< HEAD
 	compute_length(this);
+=======
+	this->payload_length = this->key_exchange_data.len + KE_PAYLOAD_HEADER_LENGTH;
+>>>>>>> upstream/4.5.1
 
 	return &this->public;
 }