X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=3rdparty%2FE2AP-v02.00.00%2FOCTET_STRING.c;fp=3rdparty%2FE2AP-v01.00.00%2FOCTET_STRING.c;h=ae34c9681920a4d7a0ba869bda7d9cd4bb3f222c;hb=483bd162c10ee2f0ef348b5c25c2987aea80b7c8;hp=432ce5ae26a69e23e24b0efe55373abd8203ac12;hpb=2392e6e49a6567a5d7477a93780b327238ee98b8;p=ric-plt%2Fsubmgr.git diff --git a/3rdparty/E2AP-v01.00.00/OCTET_STRING.c b/3rdparty/E2AP-v02.00.00/OCTET_STRING.c similarity index 99% rename from 3rdparty/E2AP-v01.00.00/OCTET_STRING.c rename to 3rdparty/E2AP-v02.00.00/OCTET_STRING.c index 432ce5a..ae34c96 100644 --- a/3rdparty/E2AP-v01.00.00/OCTET_STRING.c +++ b/3rdparty/E2AP-v02.00.00/OCTET_STRING.c @@ -157,7 +157,7 @@ OS__add_stack_el(struct _stack *st) { nel = (struct _stack_el *)CALLOC(1, sizeof(struct _stack_el)); if(nel == NULL) return NULL; - + if(st->tail) { /* Increase a subcontainment depth */ nel->cont_level = st->tail->cont_level + 1; @@ -745,7 +745,7 @@ OCTET_STRING__handle_control_chars(void *struct_ptr, const void *chunk_buf, size return 0; } } - + return -1; /* No, it's not */ } @@ -1956,7 +1956,9 @@ OCTET_STRING_encode_aper(const asn_TYPE_descriptor_t *td, ret = aper_put_length(po, csiz->upper_bound - csiz->lower_bound + 1, sizeinunits - csiz->lower_bound); if(ret) ASN__ENCODE_FAILED; } - if (st->size > 2) { /* X.691 #16 NOTE 1 */ + /* EB MOD + AFAIU if lb != ub it is aligned whatever the number of bits */ + if ((st->size > 2) || (csiz->lower_bound != csiz->upper_bound)) { /* X.691 #16.11 */ if (aper_put_align(po) < 0) ASN__ENCODE_FAILED; }