sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-12-01 00:00:31 -05:00
Code Issues Projects Releases Wiki Activity

Check that chunk fits into sequence when converting

Browse Source
This commit is contained in:
Adrian-Ken Rueegsegger 2012-11-12 12:08:32 +01:00 committed by Tobias Brunner
parent 3360bad910
commit d2371b728c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/charon-tkm/src/tkm/tkm_utils.c
View File

@ -14,6 +14,8 @@
* for more details. * for more details.
*/ */
#include <utils/debug.h>
#include "tkm_utils.h" #include "tkm_utils.h"
/* Generic variable-length sequence */ /* Generic variable-length sequence */
@ -33,8 +35,18 @@ void sequence_to_chunk(const byte_t * const first, const uint32_t len,
void chunk_to_sequence(const chunk_t * const chunk, void *sequence, void chunk_to_sequence(const chunk_t * const chunk, void *sequence,
const uint32_t typelen) const uint32_t typelen)
{ {
const uint32_t seqlenmax = typelen - sizeof(uint32_t);
memset(sequence, 0, typelen); memset(sequence, 0, typelen);
sequence_type *seq = sequence; sequence_type *seq = sequence;
seq->size = chunk->len; if (chunk->len > seqlenmax)
{
DBG1(DBG_LIB, "chunk too large to fit into sequence %d > %d, limiting"
" to %d bytes", chunk->len, seqlenmax, seqlenmax);
seq->size = seqlenmax;
}
else
{
seq->size = chunk->len;
}
memcpy(seq->data, chunk->ptr, seq->size); memcpy(seq->data, chunk->ptr, seq->size);
} }