From 2ecbd6186ea276614f6d9e011f5447c3c7865b4d Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Mon, 15 Nov 2010 11:53:20 +0100 Subject: Do not update payload length during generation, allows hooks override payload length --- src/libcharon/encoding/payloads/nonce_payload.c | 26 +++++-------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'src/libcharon/encoding/payloads/nonce_payload.c') diff --git a/src/libcharon/encoding/payloads/nonce_payload.c b/src/libcharon/encoding/payloads/nonce_payload.c index 4ad5ce9dd..2351d1f06 100644 --- a/src/libcharon/encoding/payloads/nonce_payload.c +++ b/src/libcharon/encoding/payloads/nonce_payload.c @@ -78,7 +78,7 @@ encoding_rule_t nonce_payload_encodings[] = { /* Length of the whole nonce payload*/ { PAYLOAD_LENGTH, offsetof(private_nonce_payload_t, payload_length) }, /* some nonce bytes, lenth is defined in PAYLOAD_LENGTH */ - { NONCE_DATA, offsetof(private_nonce_payload_t, nonce) } + { NONCE_DATA, offsetof(private_nonce_payload_t, nonce) }, }; /* 1 2 3 @@ -97,12 +97,10 @@ encoding_rule_t nonce_payload_encodings[] = { */ static status_t verify(private_nonce_payload_t *this) { - if ((this->nonce.len < 16) || ((this->nonce.len > 256))) + if (this->nonce.len < 16 || this->nonce.len > 256) { - /* nonce length is wrong */ return FAILED; } - return SUCCESS; } @@ -111,8 +109,7 @@ static status_t verify(private_nonce_payload_t *this) */ static status_t set_nonce(private_nonce_payload_t *this, chunk_t nonce) { - this->nonce.ptr = clalloc(nonce.ptr, nonce.len); - this->nonce.len = nonce.len; + this->nonce = chunk_clone(nonce); this->payload_length = NONCE_PAYLOAD_HEADER_LENGTH + nonce.len; return SUCCESS; } @@ -122,10 +119,7 @@ static status_t set_nonce(private_nonce_payload_t *this, chunk_t nonce) */ static chunk_t get_nonce(private_nonce_payload_t *this) { - chunk_t nonce; - nonce.ptr = clalloc(this->nonce.ptr,this->nonce.len); - nonce.len = this->nonce.len; - return nonce; + return chunk_clone(this->nonce); } /** @@ -150,7 +144,7 @@ static payload_type_t get_type(private_nonce_payload_t *this) */ static payload_type_t get_next_type(private_nonce_payload_t *this) { - return (this->next_payload); + return this->next_payload; } /** @@ -161,20 +155,11 @@ static void set_next_type(private_nonce_payload_t *this,payload_type_t type) this->next_payload = type; } -/** - * recompute the length of the payload. - */ -static void compute_length(private_nonce_payload_t *this) -{ - this->payload_length = NONCE_PAYLOAD_HEADER_LENGTH + this->nonce.len; -} - /** * Implementation of payload_t.get_length. */ static size_t get_length(private_nonce_payload_t *this) { - compute_length(this); return this->payload_length; } @@ -187,7 +172,6 @@ static void destroy(private_nonce_payload_t *this) { free(this->nonce.ptr); } - free(this); } -- cgit v1.2.3