cellular-infrastructure
/
osmo-iuh
mirror of https://gerrit.osmocom.org/osmo-iuh
9
0
Fork 0
Code Issues Releases Wiki Activity

asn1helpers: Fix asn1str_to_uX functions 

The values are stored big-endian so convert them
This commit is contained in:
Daniel Willmann 2015-11-27 17:53:19 +01:00
parent ea4c088e78
commit e3adf0edc3
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/asn1helpers.c
View File

@ -55,7 +55,7 @@ int asn1_strncpy(char *out, const OCTET_STRING_t *in, size_t n)
uint16_t asn1str_to_u16(const OCTET_STRING_t *in) uint16_t asn1str_to_u16(const OCTET_STRING_t *in)
{ {
OSMO_ASSERT(in && in->size >= sizeof(uint16_t)); OSMO_ASSERT(in && in->size >= sizeof(uint16_t));
return *(uint16_t *)in->buf; return ntohs(*(uint16_t *)in->buf);
} }
uint8_t asn1str_to_u8(const OCTET_STRING_t *in) uint8_t asn1str_to_u8(const OCTET_STRING_t *in)
@ -66,12 +66,14 @@ uint8_t asn1str_to_u8(const OCTET_STRING_t *in)
uint32_t asn1bitstr_to_u32(const BIT_STRING_t *in) uint32_t asn1bitstr_to_u32(const BIT_STRING_t *in)
{ {
uint32_t ret = 0; OSMO_ASSERT(in && in->size >= sizeof(uint32_t) && in->bits_unused == 0);
if (in->size < 4) return ntohl(*(uint32_t *)in->buf);
return 0; }
ret = *(uint32_t *)in->buf; uint32_t asn1bitstr_to_u24(const BIT_STRING_t *in)
{
return ret; OSMO_ASSERT(in && in->size >= 3 && in->bits_unused == 0);
return *(uint32_t *)in->buf;
} }