summaryrefslogtreecommitdiff
path: root/src/libcharon/encoding/payloads/certreq_payload.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libcharon/encoding/payloads/certreq_payload.c')
-rw-r--r--src/libcharon/encoding/payloads/certreq_payload.c148
1 files changed, 0 insertions, 148 deletions
diff --git a/src/libcharon/encoding/payloads/certreq_payload.c b/src/libcharon/encoding/payloads/certreq_payload.c
index 0c59fd66d..8e0836f0e 100644
--- a/src/libcharon/encoding/payloads/certreq_payload.c
+++ b/src/libcharon/encoding/payloads/certreq_payload.c
@@ -1,10 +1,6 @@
/*
-<<<<<<< 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
*
@@ -27,23 +23,13 @@
#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.
*/
@@ -60,14 +46,11 @@ 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;
@@ -88,23 +71,6 @@ 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[] = {
- /* 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, nowhere stored */
- { RESERVED_BIT, 0 },
- { RESERVED_BIT, 0 },
- { RESERVED_BIT, 0 },
- { RESERVED_BIT, 0 },
- { 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 */
@@ -119,7 +85,6 @@ encoding_rule_t certreq_payload_encodings[] = {
{ 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*/
@@ -141,15 +106,8 @@ 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)
{
@@ -164,21 +122,6 @@ METHOD(payload_t, verify, status_t,
return SUCCESS;
}
-<<<<<<< HEAD
-/**
- * Implementation of certreq_payload_t.get_encoding_rules.
- */
-static void get_encoding_rules(private_certreq_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
-{
- *rules = certreq_payload_encodings;
- *rule_count = sizeof(certreq_payload_encodings) / sizeof(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)
{
@@ -188,25 +131,10 @@ METHOD(payload_t, get_encoding_rules, void,
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.
- */
-static payload_type_t get_next_type(private_certreq_payload_t *this)
-{
- return (this->next_payload);
-}
-
-/**
- * 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)
{
@@ -215,33 +143,18 @@ METHOD(payload_t, get_next_type, payload_type_t,
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;
@@ -258,15 +171,8 @@ 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)
{
@@ -289,25 +195,6 @@ METHOD(enumerator_t, keyid_enumerate, bool,
return FALSE;
}
-<<<<<<< HEAD
-/**
- * Implementation of certreq_payload_t.create_keyid_enumerator.
- */
-static enumerator_t* create_keyid_enumerator(private_certreq_payload_t *this)
-{
- keyid_enumerator_t *enumerator = malloc_thing(keyid_enumerator_t);
- enumerator->public.enumerate = (void*)keyid_enumerate;
- enumerator->public.destroy = (void*)free;
- enumerator->full = this->data;
- enumerator->pos = NULL;
- return &enumerator->public;
-}
-
-/**
- * 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)
{
@@ -325,7 +212,6 @@ METHOD(certreq_payload_t, create_keyid_enumerator, enumerator_t*,
METHOD(certreq_payload_t, get_cert_type, certificate_type_t,
private_certreq_payload_t *this)
->>>>>>> upstream/4.5.1
{
switch (this->encoding)
{
@@ -336,15 +222,8 @@ METHOD(certreq_payload_t, get_cert_type, certificate_type_t,
}
}
-<<<<<<< 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);
@@ -355,32 +234,6 @@ METHOD2(payload_t, certreq_payload_t, destroy, void,
*/
certreq_payload_t *certreq_payload_create()
{
-<<<<<<< HEAD
- private_certreq_payload_t *this = malloc_thing(private_certreq_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_payload_type;
- this->public.payload_interface.destroy = (void (*) (payload_t*))destroy;
-
- /* public functions */
- this->public.destroy = (void (*) (certreq_payload_t*)) destroy;
- this->public.create_keyid_enumerator = (enumerator_t*(*)(certreq_payload_t*))create_keyid_enumerator;
- this->public.get_cert_type = (certificate_type_t(*)(certreq_payload_t*))get_cert_type;
- this->public.add_keyid = (void(*)(certreq_payload_t*, chunk_t keyid))add_keyid;
-
- /* private variables */
- this->critical = FALSE;
- this->next_payload = NO_PAYLOAD;
- this->payload_length = CERTREQ_PAYLOAD_HEADER_LENGTH;
- this->data = chunk_empty;
- this->encoding = 0;
-
-=======
private_certreq_payload_t *this;
INIT(this,
@@ -402,7 +255,6 @@ certreq_payload_t *certreq_payload_create()
.next_payload = NO_PAYLOAD,
.payload_length = CERTREQ_PAYLOAD_HEADER_LENGTH,
);
->>>>>>> upstream/4.5.1
return &this->public;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 00:23:38 +0000