Migrated certreq_payload to INIT/METHOD macros
This commit is contained in:
Martin Willi
parent
2aa1bffb02
commit
1cc58e7ed2
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* Copyright (C) 2005-2006 Martin Willi
|
||||
* Copyright (C) 2005-2010 Martin Willi
|
||||
* Copyright (C) 2010 revosec AG
|
||||
* Copyright (C) 2005 Jan Hutter
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
*
|
||||
|
|
@ -22,14 +23,13 @@
|
|||
|
||||
#include "certreq_payload.h"
|
||||
|
||||
|
||||
typedef struct private_certreq_payload_t private_certreq_payload_t;
|
||||
|
||||
/**
|
||||
* Private data of an certreq_payload_t object.
|
||||
*
|
||||
*/
|
||||
struct private_certreq_payload_t {
|
||||
|
||||
/**
|
||||
* Public certreq_payload_t interface.
|
||||
*/
|
||||
|
|
@ -66,21 +66,20 @@ struct private_certreq_payload_t {
|
|||
*
|
||||
* The defined offsets are the positions in a object of type
|
||||
* private_certreq_payload_t.
|
||||
*
|
||||
*/
|
||||
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) },
|
||||
{ U_INT_8, offsetof(private_certreq_payload_t, next_payload) },
|
||||
/* the critical bit */
|
||||
{ FLAG, offsetof(private_certreq_payload_t, critical) },
|
||||
{ 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 },
|
||||
{ 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_certreq_payload_t, payload_length) },
|
||||
/* 1 Byte CERTREQ type*/
|
||||
|
|
@ -102,10 +101,8 @@ encoding_rule_t certreq_payload_encodings[] = {
|
|||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
*/
|
||||
|
||||
/**
|
||||
* 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)
|
||||
{
|
||||
if (this->encoding == ENC_X509_SIGNATURE)
|
||||
{
|
||||
|
|
@ -120,51 +117,39 @@ static status_t verify(private_certreq_payload_t *this)
|
|||
return SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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)
|
||||
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 = sizeof(certreq_payload_encodings) / sizeof(encoding_rule_t);
|
||||
*rule_count = countof(certreq_payload_encodings);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of payload_t.get_type.
|
||||
*/
|
||||
static payload_type_t get_payload_type(private_certreq_payload_t *this)
|
||||
METHOD(payload_t, get_type, payload_type_t,
|
||||
private_certreq_payload_t *this)
|
||||
{
|
||||
return CERTIFICATE_REQUEST;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of payload_t.get_next_type.
|
||||
*/
|
||||
static payload_type_t get_next_type(private_certreq_payload_t *this)
|
||||
METHOD(payload_t, get_next_type, payload_type_t,
|
||||
private_certreq_payload_t *this)
|
||||
{
|
||||
return (this->next_payload);
|
||||
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, set_next_type, void,
|
||||
private_certreq_payload_t *this, payload_type_t type)
|
||||
{
|
||||
this->next_payload = type;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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)
|
||||
{
|
||||
return this->payload_length;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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)
|
||||
{
|
||||
this->data = chunk_cat("mc", this->data, keyid);
|
||||
this->payload_length += keyid.len;
|
||||
|
|
@ -181,10 +166,8 @@ struct keyid_enumerator_t {
|
|||
u_char *pos;
|
||||
};
|
||||
|
||||
/**
|
||||
* 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)
|
||||
{
|
||||
if (this->pos == NULL)
|
||||
{
|
||||
|
|
@ -207,23 +190,23 @@ static bool keyid_enumerate(keyid_enumerator_t *this, chunk_t *chunk)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of certreq_payload_t.create_keyid_enumerator.
|
||||
*/
|
||||
static enumerator_t* create_keyid_enumerator(private_certreq_payload_t *this)
|
||||
METHOD(certreq_payload_t, create_keyid_enumerator, enumerator_t*,
|
||||
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;
|
||||
keyid_enumerator_t *enumerator;
|
||||
|
||||
INIT(enumerator,
|
||||
.public = {
|
||||
.enumerate = (void*)_keyid_enumerate,
|
||||
.destroy = (void*)free,
|
||||
},
|
||||
.full = this->data,
|
||||
);
|
||||
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, get_cert_type, certificate_type_t,
|
||||
private_certreq_payload_t *this)
|
||||
{
|
||||
switch (this->encoding)
|
||||
{
|
||||
|
|
@ -234,10 +217,8 @@ static certificate_type_t get_cert_type(private_certreq_payload_t *this)
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 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)
|
||||
{
|
||||
chunk_free(&this->data);
|
||||
free(this);
|
||||
|
|
@ -248,30 +229,27 @@ static void destroy(private_certreq_payload_t *this)
|
|||
*/
|
||||
certreq_payload_t *certreq_payload_create()
|
||||
{
|
||||
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,
|
||||
.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,
|
||||
);
|
||||
return &this->public;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue