Correctly handle ASN.1 data inside octet strings.

If we were able to successfully parse ASN.1 data embedded in an
OCTET STRING, we ended up not reporting the OCTET STRING tagging.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/lib/asn1/asn1_print.cpp b/src/lib/asn1/asn1_print.cpp
index 3452e91c4..c4d87f293 100644
--- a/src/lib/asn1/asn1_print.cpp
+++ b/src/lib/asn1/asn1_print.cpp
@@ -246,7 +246,12 @@ void ASN1_Pretty_Printer::decode(std::ostream& output,
          try
             {
             BER_Decoder inner(decoded_bits);
-            decode(output, inner, level + 1);
+
+            std::ostringstream inner_data;
+            decode(inner_data, inner, level + 1);
+
+            emit(output, asn1_tag_to_string(type_tag), level, length, "");
+            output << inner_data.str();
             }
          catch(...)
             {