Changeset 52533 in vbox for trunk/include

Timestamp:

Aug 29, 2014 10:51:39 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95788

Message:

ASN.1 decoding: limit nesting.

Location:

trunk/include/iprt

Files:

• asn1.h (modified) (3 diffs)
• err.h (modified) (1 diff)

trunk/include/iprt/asn1.h

@@ -1495 +1495 @@
     uint32_t                    cbLeft;
     /** RTASN1CURSOR_FLAGS_XXX.  */
-    uint32_t                    fFlags;
+    uint8_t                     fFlags;
+    /** The cursor depth. */
+    uint8_t                     cDepth;
+    /** Two bytes reserved for future tricks. */
+    uint8_t                     abReserved[2];
     /** Pointer to the primary cursor. */
     struct RTASN1CURSORPRIMARY *pPrimary;
@@ -1551 +1555 @@
  * Initialize a sub-cursor for traversing the content of an ASN.1 object.
  *
- * @returns @a pChild
+ * @returns IPRT status code.
  * @param   pParent             The parent cursor.
  * @param   pAsn1Core           The ASN.1 object which content we should
@@ -1558 +1562 @@
  * @param   pszErrorTag         The error tag of the sub-cursor.
  */
-RTDECL(PRTASN1CURSOR) RTAsn1CursorInitSubFromCore(PRTASN1CURSOR pParent, PRTASN1CORE pAsn1Core,
-                                                  PRTASN1CURSOR pChild, const char *pszErrorTag);
+RTDECL(int) RTAsn1CursorInitSubFromCore(PRTASN1CURSOR pParent, PRTASN1CORE pAsn1Core,
+                                        PRTASN1CURSOR pChild, const char *pszErrorTag);
 
 /**

trunk/include/iprt/err.h

@@ -2082 +2082 @@
 /** Expected valid data pointer for ASN.1 object. */
 #define VERR_ASN1_INVALID_DATA_POINTER              (-22854)
+/** The ASN.1 encoding is too deeply nested for the decoder. */
+#define VERR_ASN1_TOO_DEEPLY_NESTED                 (-22855)
 
 /** ANS.1 internal error 1. */