diff --git a/src/libasn1/oer_get_ext.c b/src/libasn1/oer_get_ext.c index f91beb8..6166ac6 100644 --- a/src/libasn1/oer_get_ext.c +++ b/src/libasn1/oer_get_ext.c @@ -80,10 +80,7 @@ uint oer_get_extension(OER_Stream *oer, OER_Extension *ext, uint noptions, uint uint length; oer_get_length(oer, &length); - ext->length = length; - - if (_asn1_debug_on_) - printf("\tEXT_LEN = %d\n", ext->length); + ext->length = length; // otherwise no ... } else { diff --git a/src/libasn1/oer_put_ext.c b/src/libasn1/oer_put_ext.c index e7b9204..feaee7d 100644 --- a/src/libasn1/oer_put_ext.c +++ b/src/libasn1/oer_put_ext.c @@ -75,8 +75,6 @@ void oer_put_extension(OER_Stream *oer, OER_Extension *ext) if (ext->length) { uint len = ext->length & 0x7fff; - if (_asn1_debug_on_) - printf("\tEXT_LEN = %d\n", ext->length); oer_put_length(oer, len); } } diff --git a/src/libasn1/uper_decode.c b/src/libasn1/uper_decode.c index fc25929..b99211c 100644 --- a/src/libasn1/uper_decode.c +++ b/src/libasn1/uper_decode.c @@ -131,7 +131,7 @@ uint64_t uper_get_bits_stream(UPER_Stream *uper, uint nbits) uint n = 1 + ((sbit + nbits)/8); if (_asn1_debug_on_ == 2) - printf("\tGET_BITS_DETAIL = sbit=%d, ebit=%d, nbits=%d (%d) ", sbit, ebit, nbits, n); + printf("\tGET_BITS_DETAIL = byte=%03x, sbit=%d, ebit=%d, nbits=%d (%d) ", uper->consumed/8, sbit, ebit, nbits, n); if (nbits==1) { // speed short cut @@ -159,7 +159,7 @@ uint64_t uper_get_bits_stream(UPER_Stream *uper, uint nbits) uper->consumed += nbits; if (_asn1_debug_on_) - printf("\tGET_BITS = %08lx (%ld)\n", value, value); + printf("\tGET_BITS_DATA = %08lx (%ld)\n", value, value); return value; } diff --git a/src/libasn1/uper_get_ext.c b/src/libasn1/uper_get_ext.c index 2396a12..789df92 100644 --- a/src/libasn1/uper_get_ext.c +++ b/src/libasn1/uper_get_ext.c @@ -69,20 +69,21 @@ uint uper_get_extension(UPER_Stream *uper, UPER_Extension *ext, uint noptions, u if (ellipses) { ext->ellipses = uper_get_bits_stream(uper, 1); } + else + ext->ellipses = 0; // check for options if (noptions) { ext->value = uper_get_bits_stream(uper, noptions); ext->options = noptions; } + else + ext->options = 0; if (ext->ellipses) { uper_get_ext_length(uper, ext); - - if (_asn1_debug_on_) - printf("\tEXT_LEN = %d\n", ext->length); // otherwise no ... - } + } return ellipses + noptions; } diff --git a/src/libasn1/uper_put_ext.c b/src/libasn1/uper_put_ext.c index 022b7fc..b9f99cf 100644 --- a/src/libasn1/uper_put_ext.c +++ b/src/libasn1/uper_put_ext.c @@ -70,8 +70,6 @@ void uper_put_extension(UPER_Stream *uper, UPER_Extension *ext) if (ext->length) { uint len = ext->length & 0x7fff; - if (_asn1_debug_on_) - printf("\tEXT_LEN = %d\n", ext->length); if (len >= 128) { uper_put_bits_stream(uper, 0x8000 | len, 16); }