From 5113680f95e522c677cdd37072cfffbdca06831e Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Mon, 10 Apr 2006 08:07:38 +0000 Subject: - split up in libstrong, charon, stroke, testing done - new leak detective with malloc hook in library - useable, but needs improvements - logger_manager has now a single instance per library - allows use of loggers from any linking prog - a LOT of other things --- Source/charon/encoding/payloads/certreq_payload.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/charon/encoding/payloads/certreq_payload.c') diff --git a/Source/charon/encoding/payloads/certreq_payload.c b/Source/charon/encoding/payloads/certreq_payload.c index b7372a7a2..cdab82be4 100644 --- a/Source/charon/encoding/payloads/certreq_payload.c +++ b/Source/charon/encoding/payloads/certreq_payload.c @@ -20,9 +20,9 @@ * for more details. */ -#include "certreq_payload.h" +#include -#include +#include "certreq_payload.h" typedef struct private_certreq_payload_t private_certreq_payload_t; @@ -182,9 +182,9 @@ static void set_data (private_certreq_payload_t *this, chunk_t data) { if (this->certreq_data.ptr != NULL) { - allocator_free_chunk(&(this->certreq_data)); + chunk_free(&(this->certreq_data)); } - this->certreq_data.ptr = allocator_clone_bytes(data.ptr,data.len); + this->certreq_data.ptr = clalloc(data.ptr,data.len); this->certreq_data.len = data.len; this->payload_length = CERTREQ_PAYLOAD_HEADER_LENGTH + this->certreq_data.len; } @@ -207,7 +207,7 @@ static chunk_t get_data_clone (private_certreq_payload_t *this) { return (this->certreq_data); } - cloned_data.ptr = allocator_clone_bytes(this->certreq_data.ptr,this->certreq_data.len); + cloned_data.ptr = clalloc(this->certreq_data.ptr,this->certreq_data.len); cloned_data.len = this->certreq_data.len; return cloned_data; } @@ -219,10 +219,10 @@ static void destroy(private_certreq_payload_t *this) { if (this->certreq_data.ptr != NULL) { - allocator_free_chunk(&(this->certreq_data)); + chunk_free(&(this->certreq_data)); } - allocator_free(this); + free(this); } /* @@ -230,7 +230,7 @@ static void destroy(private_certreq_payload_t *this) */ certreq_payload_t *certreq_payload_create() { - private_certreq_payload_t *this = allocator_alloc_thing(private_certreq_payload_t); + private_certreq_payload_t *this = malloc_thing(private_certreq_payload_t); /* interface functions */ this->public.payload_interface.verify = (status_t (*) (payload_t *))verify; -- cgit v1.2.3