Merge remote-tracking branch 'github/master'

[stg.git] / libs / smux / ber_decoder.c

diff --git a/libs/smux/ber_decoder.c b/libs/smux/ber_decoder.c
index 601f66c0b0274b74dcb56e7eca469ded9b076b2c..b3a6329e063f67c9855ffaf3e6a48d2292ec637d 100644 (file)
--- a/libs/smux/ber_decoder.c
+++ b/libs/smux/ber_decoder.c
@@ -44,7 +44,7 @@ ber_decode(asn_codec_ctx_t *opt_codec_ctx,
        } else {
                /* If context is not given, be security-conscious anyway */
                memset(&s_codec_ctx, 0, sizeof(s_codec_ctx));
        } else {
                /* If context is not given, be security-conscious anyway */
                memset(&s_codec_ctx, 0, sizeof(s_codec_ctx));

-               s_codec_ctx.max_stack_size = _ASN_DEFAULT_STACK_MAX;
+               s_codec_ctx.max_stack_size = ASN__DEFAULT_STACK_MAX;

                opt_codec_ctx = &s_codec_ctx;
        }
 
                opt_codec_ctx = &s_codec_ctx;
        }
 


@@ -80,7 +80,7 @@ ber_check_tags(asn_codec_ctx_t *opt_codec_ctx,
        /*
         * Make sure we didn't exceed the maximum stack size.
         */
        /*
         * Make sure we didn't exceed the maximum stack size.
         */

-       if(_ASN_STACK_OVERFLOW_CHECK(opt_codec_ctx))
+       if(ASN__STACK_OVERFLOW_CHECK(opt_codec_ctx))

                RETURN(RC_FAIL);
 
        /*
                RETURN(RC_FAIL);
 
        /*


@@ -206,7 +206,7 @@ ber_check_tags(asn_codec_ctx_t *opt_codec_ctx,
                 */
                len_len = ber_fetch_length(tlv_constr,
                        (const char *)ptr + tag_len, size - tag_len, &tlv_len);
                 */
                len_len = ber_fetch_length(tlv_constr,
                        (const char *)ptr + tag_len, size - tag_len, &tlv_len);

-               ASN_DEBUG("Fetchinig len = %ld", (long)len_len);
+               ASN_DEBUG("Fetching len = %ld", (long)len_len);

                switch(len_len) {
                case -1: RETURN(RC_FAIL);
                case 0: RETURN(RC_WMORE);
                switch(len_len) {
                case -1: RETURN(RC_FAIL);
                case 0: RETURN(RC_WMORE);