- import of strongswan-2.7.0

- applied patch for charon

1 files changed, 0 insertions, 441 deletions

diff --git a/Source/charon/encoding/payloads/notify_payload.c b/Source/charon/encoding/payloads/notify_payload.c
deleted file mode 100644
index 43d0c5322..000000000
--- a/Source/charon/encoding/payloads/notify_payload.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/**
- * @file notify_payload.c
- * 
- * @brief Implementation of notify_payload_t.
- * 
- */
-
-/*
- * Copyright (C) 2005 Jan Hutter, Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include <stddef.h>
-
-#include "notify_payload.h"
-
-#include <daemon.h>
-#include <encoding/payloads/encodings.h>
-
-/** 
- * String mappings for notify_message_type_t.
- */
-mapping_t notify_message_type_m[] = {
-	{UNSUPPORTED_CRITICAL_PAYLOAD, "UNSUPPORTED_CRITICAL_PAYLOAD"},
-	{INVALID_IKE_SPI, "INVALID_IKE_SPI"},
-	{INVALID_MAJOR_VERSION, "INVALID_MAJOR_VERSION"},
-	{INVALID_SYNTAX, "INVALID_SYNTAX"},
-	{INVALID_MESSAGE_ID, "INVALID_MESSAGE_ID"},
-	{INVALID_SPI, "INVALID_SPI"},
-	{NO_PROPOSAL_CHOSEN, "NO_PROPOSAL_CHOSEN"},
-	{INVALID_KE_PAYLOAD, "INVALID_KE_PAYLOAD"},
-	{AUTHENTICATION_FAILED, "AUTHENTICATION_FAILED"},
-	{SINGLE_PAIR_REQUIRED, "SINGLE_PAIR_REQUIRED"},
-	{NO_ADDITIONAL_SAS, "NO_ADDITIONAL_SAS"},
-	{INTERNAL_ADDRESS_FAILURE, "INTERNAL_ADDRESS_FAILURE"},
-	{FAILED_CP_REQUIRED, "FAILED_CP_REQUIRED"},
-	{TS_UACCEPTABLE, "TS_UACCEPTABLE"},
-	{INVALID_SELECTORS, "INVALID_SELECTORS"},
-	{INITIAL_CONTACT, "INITIAL_CONTACT"},
-	{SET_WINDOW_SIZE, "SET_WINDOW_SIZE"},
-	{MAPPING_END, NULL}
-};
-
-typedef struct private_notify_payload_t private_notify_payload_t;
-
-/**
- * Private data of an notify_payload_t object.
- * 
- */
-struct private_notify_payload_t {
-	/**
-	 * Public notify_payload_t interface.
-	 */
-	notify_payload_t public;
-	
-	/**
-	 * Next payload type.
-	 */
-	u_int8_t  next_payload;
-
-	/**
-	 * Critical flag.
-	 */
-	bool critical;
-		
-	/**
-	 * Length of this payload.
-	 */
-	u_int16_t payload_length;
-		
-	/**
-	 * Protocol id.
-	 */
-	u_int8_t protocol_id;
-	
-	/**
-	 * Spi size.
-	 */
-	u_int8_t spi_size;
-	
-	/**
-	 * Notify message type.
-	 */
-	u_int16_t notify_message_type;
-	
-	/**
-	 * Security parameter index (spi).
-	 */
-	chunk_t spi;
-
-	/**
-	 * Notification data.
-	 */
-	chunk_t notification_data;
-	
-	/**
-	 * Assigned logger
-	 */
-	logger_t *logger;
-	
-	/**
-	 * @brief Computes the length of this payload.
-	 *
-	 * @param this 	calling private_ke_payload_t object
-	 */
-	void (*compute_length) (private_notify_payload_t *this);
-};
-
-/**
- * Encoding rules to parse or generate a IKEv2-Notify Payload.
- * 
- * The defined offsets are the positions in a object of type 
- * private_notify_payload_t.
- * 
- */
-encoding_rule_t notify_payload_encodings[] = {
- 	/* 1 Byte next payload type, stored in the field next_payload */
-	{ U_INT_8,			offsetof(private_notify_payload_t, next_payload) 		},
-	/* the critical bit */
-	{ FLAG,				offsetof(private_notify_payload_t, critical) 			},	
- 	/* 7 Bit reserved bits, nowhere stored */
-	{ RESERVED_BIT,	0 														}, 
-	{ RESERVED_BIT,	0 														}, 
-	{ RESERVED_BIT,	0 														}, 
-	{ RESERVED_BIT,	0 														}, 
-	{ RESERVED_BIT,	0 														}, 
-	{ RESERVED_BIT,	0 														}, 
-	{ RESERVED_BIT,	0 														}, 
-	/* Length of the whole payload*/
-	{ PAYLOAD_LENGTH,	offsetof(private_notify_payload_t, payload_length) 		},	
-	/* Protocol ID as 8 bit field*/
-	{ U_INT_8,			offsetof(private_notify_payload_t, protocol_id) 			},
-	/* SPI Size as 8 bit field*/
-	{ SPI_SIZE,			offsetof(private_notify_payload_t, spi_size) 			},
-	/* Notify message type as 16 bit field*/
-	{ U_INT_16,			offsetof(private_notify_payload_t, notify_message_type)	},
-	/* SPI as variable length field*/
-	{ SPI,				offsetof(private_notify_payload_t, spi)		 			},
-	/* Key Exchange Data is from variable size */
-	{ NOTIFICATION_DATA,	offsetof(private_notify_payload_t, notification_data) 	}
-};
-
-/*
-                           1                   2                   3
-       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      ! Next Payload  !C!  RESERVED   !         Payload Length        !
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      !  Protocol ID  !   SPI Size    !      Notify Message Type      !
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      !                                                               !
-      ~                Security Parameter Index (SPI)                 ~
-      !                                                               !
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      !                                                               !
-      ~                       Notification Data                       ~
-      !                                                               !
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-*/
-
-/**
- * Implementation of payload_t.verify.
- */
-static status_t verify(private_notify_payload_t *this)
-{
-	if (this->protocol_id > 3)
-	{
-		/* reserved for future use */
-		return FAILED;
-	}
-	
-	/* TODO: Check all kinds of notify */
-	
-	if (this->notify_message_type == INVALID_KE_PAYLOAD)
-	{
-		/* check notification data */
-		diffie_hellman_group_t dh_group;
-		if (this->notification_data.len != 2)
-		{
-			return FAILED;
-		}
-		dh_group = ntohs(*((u_int16_t*)this->notification_data.ptr));
-		switch (dh_group)
-		{
-			case MODP_768_BIT:
-			case MODP_1024_BIT:
-			case MODP_1536_BIT:
-			case MODP_2048_BIT:
-			case MODP_3072_BIT:
-			case MODP_4096_BIT:
-			case MODP_6144_BIT:
-			case MODP_8192_BIT:
-				break;
-			default:
-				this->logger->log(this->logger, ERROR, "Bad DH group (%d)", dh_group);
-				return FAILED;
-		}
-	}
-	return SUCCESS;
-}
-
-/**
- * Implementation of payload_t.get_encoding_rules.
- */
-static void get_encoding_rules(private_notify_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
-{
-	*rules = notify_payload_encodings;
-	*rule_count = sizeof(notify_payload_encodings) / sizeof(encoding_rule_t);
-}
-
-/**
- * Implementation of payload_t.get_type.
- */
-static payload_type_t get_type(private_notify_payload_t *this)
-{
-	return NOTIFY;
-}
-
-/**
- * Implementation of payload_t.get_next_type.
- */
-static payload_type_t get_next_type(private_notify_payload_t *this)
-{
-	return (this->next_payload);
-}
-
-/**
- * Implementation of payload_t.set_next_type.
- */
-static void set_next_type(private_notify_payload_t *this,payload_type_t type)
-{
-	this->next_payload = type;
-}
-
-/**
- * Implementation of payload_t.get_length.
- */
-static size_t get_length(private_notify_payload_t *this)
-{
-	this->compute_length(this);
-	return this->payload_length;
-}
-
-/**
- * Implementation of private_notify_payload_t.compute_length.
- */
-static void compute_length (private_notify_payload_t *this)
-{
-	size_t length = NOTIFY_PAYLOAD_HEADER_LENGTH;
-	if (this->notification_data.ptr != NULL)
-	{
-		length += this->notification_data.len;
-	}
-	if (this->spi.ptr != NULL)
-	{
-		length += this->spi.len;
-	}
-	
-	this->payload_length = length;
-
-}
-
-/**
- * Implementation of notify_payload_t.get_protocol_id.
- */
-static u_int8_t get_protocol_id(private_notify_payload_t *this)
-{
-	return this->protocol_id;
-}
-
-/**
- * Implementation of notify_payload_t.set_protocol_id.
- */
-static void set_protocol_id(private_notify_payload_t *this, u_int8_t protocol_id)
-{
-	this->protocol_id = protocol_id;
-}
-
-/**
- * Implementation of notify_payload_t.get_notify_message_type.
- */
-static u_int16_t get_notify_message_type(private_notify_payload_t *this)
-{
-	return this->notify_message_type;
-}
-
-/**
- * Implementation of notify_payload_t.set_notify_message_type.
- */
-static void set_notify_message_type(private_notify_payload_t *this, u_int16_t notify_message_type)
-{
-	this->notify_message_type = notify_message_type;
-}
-
-/**
- * Implementation of notify_payload_t.get_spi.
- */
-static chunk_t get_spi(private_notify_payload_t *this)
-{
-	return (this->spi);
-}
-
-/**
- * Implementation of notify_payload_t.set_spi.
- */
-static void set_spi(private_notify_payload_t *this, chunk_t spi)
-{
-	/* destroy existing data first */
-	if (this->spi.ptr != NULL)
-	{
-		/* free existing value */
-		free(this->spi.ptr);
-		this->spi.ptr = NULL;
-		this->spi.len = 0;
-		
-	}
-	
-	this->spi.ptr = clalloc(spi.ptr,spi.len);
-
-	this->spi.len = spi.len;
-	this->spi_size = spi.len;
-	this->compute_length(this);
-
-}
-
-/**
- * Implementation of notify_payload_t.get_notification_data.
- */
-static chunk_t get_notification_data(private_notify_payload_t *this)
-{
-	return (this->notification_data);
-}
-
-/**
- * Implementation of notify_payload_t.set_notification_data.
- */
-static status_t set_notification_data(private_notify_payload_t *this, chunk_t notification_data)
-{
-	/* destroy existing data first */
-	if (this->notification_data.ptr != NULL)
-	{
-		/* free existing value */
-		free(this->notification_data.ptr);
-		this->notification_data.ptr = NULL;
-		this->notification_data.len = 0;
-		
-	}
-	
-	this->notification_data.ptr = clalloc(notification_data.ptr,notification_data.len);
-	this->notification_data.len = notification_data.len;
-	this->compute_length(this);
-	
-	return SUCCESS;
-}
-
-/**
- * Implementation of notify_payload_t.destroy and notify_payload_t.destroy.
- */
-static status_t destroy(private_notify_payload_t *this)
-{
-	if (this->notification_data.ptr != NULL)
-	{
-		free(this->notification_data.ptr);
-	}
-	if (this->spi.ptr != NULL)
-	{
-		free(this->spi.ptr);
-	}
-
-	free(this);
-	return SUCCESS;
-}
-
-/*
- * Described in header
- */
-notify_payload_t *notify_payload_create()
-{
-	private_notify_payload_t *this = malloc_thing(private_notify_payload_t);
-
-	/* interface functions */
-	this->public.payload_interface.verify = (status_t (*) (payload_t *))verify;
-	this->public.payload_interface.get_encoding_rules = (void (*) (payload_t *, encoding_rule_t **, size_t *) ) get_encoding_rules;
-	this->public.payload_interface.get_length = (size_t (*) (payload_t *)) get_length;
-	this->public.payload_interface.get_next_type = (payload_type_t (*) (payload_t *)) get_next_type;
-	this->public.payload_interface.set_next_type = (void (*) (payload_t *,payload_type_t)) set_next_type;
-	this->public.payload_interface.get_type = (payload_type_t (*) (payload_t *)) get_type;
-	this->public.payload_interface.destroy = (void (*) (payload_t *))destroy;
-
-	/* public functions */
-	this->public.get_protocol_id = (u_int8_t (*) (notify_payload_t *)) get_protocol_id;
-	this->public.set_protocol_id  = (void (*) (notify_payload_t *,u_int8_t)) set_protocol_id;
-	this->public.get_notify_message_type = (u_int16_t (*) (notify_payload_t *)) get_notify_message_type;
-	this->public.set_notify_message_type = (void (*) (notify_payload_t *,u_int16_t)) set_notify_message_type;
-	this->public.get_spi = (chunk_t (*) (notify_payload_t *)) get_spi;
-	this->public.set_spi = (void (*) (notify_payload_t *,chunk_t)) set_spi;
-	this->public.get_notification_data = (chunk_t (*) (notify_payload_t *)) get_notification_data;
-	this->public.set_notification_data = (void (*) (notify_payload_t *,chunk_t)) set_notification_data;
-	this->public.destroy = (void (*) (notify_payload_t *)) destroy;
-	
-	/* private functions */
-	this->compute_length = compute_length;
-	
-	/* set default values of the fields */
-	this->critical = FALSE;
-	this->next_payload = NO_PAYLOAD;
-	this->payload_length = NOTIFY_PAYLOAD_HEADER_LENGTH;
-	this->protocol_id = 0;
-	this->notify_message_type = 0;
-	this->spi.ptr = NULL;
-	this->spi.len = 0;
-	this->spi_size = 0;
-	this->notification_data.ptr = NULL;
-	this->notification_data.len = 0;
-	this->logger = logger_manager->get_logger(logger_manager, PAYLOAD);
-
-	return (&(this->public));
-}
-
-/*
- * Described in header.
- */
-notify_payload_t *notify_payload_create_from_protocol_and_type(protocol_id_t protocol_id, notify_message_type_t notify_message_type)
-{
-	notify_payload_t *notify = notify_payload_create();
-
-	notify->set_notify_message_type(notify,notify_message_type);
-	notify->set_protocol_id(notify,protocol_id);
-	
-	return notify;
-}