stv0g/libsml
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed multibyte type-length field calculation

Browse source
This commit is contained in:
Juri Glass 2012-05-29 13:13:30 +02:00
parent 8e6cd61d2f
commit 48c89b7aee
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sml/src/sml_shared.c
View file

@ -53,19 +53,30 @@ void sml_buf_set_type_and_length(sml_buffer *buf, unsigned int type, unsigned in
}
if (l > SML_LENGTH_FIELD) {
// how much shifts are necessary
int mask_pos = (sizeof(unsigned int) * 2) - 1;
// the 4 most significant bits of l
// the 4 most significant bits of l (1111 0000 0000 ...)
unsigned int mask = 0xF0 << (8 * (sizeof(unsigned int) - 1));
// select the 4 most significant bits with a bit set
// select the next 4 most significant bits with a bit set until there
// is something
while (!(mask & l)) {
mask >>= 4;
mask_pos--;
}
// copy the bits to the buffer
l += mask_pos; // for every TL-field
if ((0x0F << (4 * (mask_pos + 1))) & l) {
// for the rare case that the addition of the number of TL-fields
// result in another TL-field.
mask_pos++;
l++;
}
// copy 4 bits of the number to the buffer
while (mask > SML_LENGTH_FIELD) {
buf->buffer[buf->cursor] |= SML_ANOTHER_TL;
buf->buffer[buf->cursor] |= ((mask & l) >> (4 * mask_pos));
@ -74,6 +85,7 @@ void sml_buf_set_type_and_length(sml_buffer *buf, unsigned int type, unsigned in
buf->cursor++;
}
}
buf->buffer[buf->cursor] |= (l & SML_LENGTH_FIELD);
buf->cursor++;
}

10
test/src/sml_octet_string_test.c
View file

@ -67,6 +67,15 @@ TEST(sml_octet_string, write) {
expected_buf(buf, "0648616C6C6F", 6);
}
TEST(sml_octet_string, write_multiple_tl_fields) {
octet_string *str = sml_octet_string_init((unsigned char *)"aaaaoaaaaaaaaaaa", 16);
sml_octet_string_write(str, buf);
printf("\n");
hexdump(buf->buffer, 18);
expected_buf(buf, "8102616161616F6161616161616161616161", 18);
}
TEST(sml_octet_string, write_optional) {
sml_octet_string_write(0, buf);
expected_buf(buf, "01", 1);
@ -92,6 +101,7 @@ TEST_GROUP_RUNNER(sml_octet_string) {
RUN_TEST_CASE(sml_octet_string, parse_multiple_tl_fields);
RUN_TEST_CASE(sml_octet_string, parse_optional);
RUN_TEST_CASE(sml_octet_string, write);
RUN_TEST_CASE(sml_octet_string, write_multiple_tl_fields);
RUN_TEST_CASE(sml_octet_string, write_optional);
RUN_TEST_CASE(sml_octet_string, cmp);
RUN_TEST_CASE(sml_octet_string, cmp_with_hex);