sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[AMF] asn1c decode error for APC_EXTENSIBLE (#994)

This commit is contained in:
Sukchan Lee 2021-05-14 16:46:08 +09:00
parent 257f398a11
commit f861919507
4 changed files with 114 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/asn1c/ngap/NGAP_AMFNameUTF8String.c
View File

@ -46,7 +46,11 @@ NGAP_AMFNameUTF8String_constraint(const asn_TYPE_descriptor_t *td, const void *s
#if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT)
asn_per_constraints_t asn_PER_type_NGAP_AMFNameUTF8String_constr_1 CC_NOTUSED = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
#if 0 /* modified by acetcom */
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
#else
{ APC_CONSTRAINED | APC_EXTENSIBLE, 8, 8, 1, 150 } /* (SIZE(1..150,...)) */,
#endif
0, 0 /* No PER value map */
};
#endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */

4
lib/asn1c/ngap/NGAP_RANNodeNameUTF8String.c
View File

@ -46,7 +46,11 @@ NGAP_RANNodeNameUTF8String_constraint(const asn_TYPE_descriptor_t *td, const voi
#if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT)
asn_per_constraints_t asn_PER_type_NGAP_RANNodeNameUTF8String_constr_1 CC_NOTUSED = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
#if 0 /* modified by acetcom */
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
#else
{ APC_CONSTRAINED | APC_EXTENSIBLE, 8, 8, 1, 150 } /* (SIZE(1..150,...)) */,
#endif
0, 0 /* No PER value map */
};
#endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */

34
lib/asn1c/support/README.md
View File

@ -116,6 +116,40 @@ index 67ad9db5..1adbdde6 100644
return per_put_few_bits(po, length-1, 7) ? -1 : 0;
} else {
Fix NGAP_RANNodeNameUTF8String.c/NGAP_AMFNameUTF8String.c
===========================================
diff --git a/lib/asn1c/ngap/NGAP_RANNodeNameUTF8String.c b/lib/asn1c/ngap/NGAP_RANNodeNameUTF8String.c
index 9e469f7f..79ebd028 100644
--- a/lib/asn1c/ngap/NGAP_RANNodeNameUTF8String.c
+++ b/lib/asn1c/ngap/NGAP_RANNodeNameUTF8String.c
@@ -46,7 +46,11 @@ NGAP_RANNodeNameUTF8String_constraint(const asn_TYPE_descriptor_t *td, const voi
#if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT)
asn_per_constraints_t asn_PER_type_NGAP_RANNodeNameUTF8String_constr_1 CC_NOTUSED = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
+#if 0 /* modified by acetcom */
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
+#else
+ { APC_CONSTRAINED | APC_EXTENSIBLE, 8, 8, 1, 150 } /* (SIZE(1..150,...)) */,
+#endif
0, 0 /* No PER value map */
};
#endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */
diff --git a/lib/asn1c/ngap/NGAP_AMFNameUTF8String.c b/lib/asn1c/ngap/NGAP_AMFNameUTF8String.c
index 1df33a4d..a74f97ea 100644
--- a/lib/asn1c/ngap/NGAP_AMFNameUTF8String.c
+++ b/lib/asn1c/ngap/NGAP_AMFNameUTF8String.c
@@ -46,7 +46,11 @@ NGAP_AMFNameUTF8String_constraint(const asn_TYPE_descriptor_t *td, const void *s
#if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT)
asn_per_constraints_t asn_PER_type_NGAP_AMFNameUTF8String_constr_1 CC_NOTUSED = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
+#if 0 /* modified by acetcom */
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
+#else
+ { APC_CONSTRAINED | APC_EXTENSIBLE, 8, 8, 1, 150 } /* (SIZE(1..150,...)) */,
+#endif
0, 0 /* No PER value map */
};
#endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */
Fix NGAP_ProtocolExtensionField.c
===========================================

72
tests/unit/ngap-message-test.c
View File

@ -114,6 +114,76 @@ static void ngap_message_test2(abts_case *tc, void *data)
ogs_pkbuf_free(pkbuf);
}
static void ngap_message_test3(abts_case *tc, void *data)
{
/* NGReset */
const char *payload =
"0015004200000500 1b00090009f10728 000800000052400b 0400354720674e42"
"2d43550066000d00 000000010009f107 0000000800154001 0001114009403035"
"484c41423032";
ogs_ngap_message_t message;
ogs_pkbuf_t *pkbuf;
int result;
char hexbuf[OGS_MAX_SDU_LEN];
ogs_ngap_message_t *struct_ptr = NULL;
size_t struct_size;
asn_dec_rval_t dec_ret = {0};
pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
ogs_assert(pkbuf);
ogs_pkbuf_put_data(pkbuf,
OGS_HEX(payload, strlen(payload), hexbuf), 70);
struct_ptr = &message;
struct_size = sizeof(ogs_ngap_message_t);
memset(struct_ptr, 0, struct_size);
dec_ret = aper_decode(NULL, &asn_DEF_NGAP_NGAP_PDU, (void **)&struct_ptr,
pkbuf->data, pkbuf->len, 0, 0);
ABTS_INT_EQUAL(tc, 0, dec_ret.code);
ABTS_INT_EQUAL(tc, 560, dec_ret.consumed);
ogs_ngap_free(&message);
ogs_pkbuf_free(pkbuf);
}
static void ngap_message_test4(abts_case *tc, void *data)
{
/* NGReset */
const char *payload =
"0015003f00000500 1b00080045f01000 0000040052400903 0035484c41423032"
"0066000d00000062 280045f010000000 0800154001400111 4009203035484c41"
"423032";
ogs_ngap_message_t message;
ogs_pkbuf_t *pkbuf;
int result;
char hexbuf[OGS_MAX_SDU_LEN];
ogs_ngap_message_t *struct_ptr = NULL;
size_t struct_size;
asn_dec_rval_t dec_ret = {0};
pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
ogs_assert(pkbuf);
ogs_pkbuf_put_data(pkbuf,
OGS_HEX(payload, strlen(payload), hexbuf), 67);
struct_ptr = &message;
struct_size = sizeof(ogs_ngap_message_t);
memset(struct_ptr, 0, struct_size);
dec_ret = aper_decode(NULL, &asn_DEF_NGAP_NGAP_PDU, (void **)&struct_ptr,
pkbuf->data, pkbuf->len, 0, 0);
ABTS_INT_EQUAL(tc, 0, dec_ret.code);
ABTS_INT_EQUAL(tc, 536, dec_ret.consumed);
ogs_ngap_free(&message);
ogs_pkbuf_free(pkbuf);
}
abts_suite *test_ngap_message(abts_suite *suite)
{
suite = ADD_SUITE(suite)
@ -122,6 +192,8 @@ abts_suite *test_ngap_message(abts_suite *suite)
abts_run_test(suite, ngap_message_test1, NULL);
abts_run_test(suite, ngap_message_test2, NULL);
abts_run_test(suite, ngap_message_test3, NULL);
abts_run_test(suite, ngap_message_test4, NULL);
return suite;
}