Changeset 64817 in vbox for trunk/src/VBox/Runtime/common/asn1

Timestamp:

Dec 8, 2016 9:44:02 PM (8 years ago)

Author:

vboxsync

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

112201

Message:

IPRT: Added RTAsn1QueryObjIdName and RTCrDigestTypeToName.

File:

• trunk/src/VBox/Runtime/common/asn1/asn1-dump.cpp (modified) (7 diffs)

trunk/src/VBox/Runtime/common/asn1/asn1-dump.cpp

@@ -142 +142 @@
             }
             else
-                return &g_aSmallOidTable[iEntry];
+                return &g_aSmallOidTable[i];
         }
     }
@@ -149 +149 @@
 
 
-
 /**
  * Queries the name for an object identifier.
  *
- * @returns true if found, false if not.
+ * @returns IPRT status code (VINF_SUCCESS, VERR_NOT_FOUND,
+ *          VERR_BUFFER_OVERFLOW)
  * @param   pauComponents   The components making up the object ID.
  * @param   cComponents     The number of components.
@@ -159 +159 @@
  * @param   cbDst           The size of the destination buffer.
  */
-static bool rtOidDbQueryObjIdName(uint32_t const *pauComponents, uint8_t cComponents, char *pszDst, size_t cbDst)
-{
+static int rtOidDbQueryObjIdName(uint32_t const *pauComponents, uint8_t cComponents, char *pszDst, size_t cbDst)
+{
+    int rc = VERR_NOT_FOUND;
     if (cComponents > 0)
     {
@@ -181 +182 @@
                         if (RTBldProgStrTabQueryString(&g_OidDbStrTab, pSmallHit->offString,
                                                        pSmallHit->cchString, pszDst, cbDst) >= 0)
-                            return true;
+                            return VINF_SUCCESS;
+                        rc = VERR_BUFFER_OVERFLOW;
                         break;
                     }
@@ -202 +204 @@
                         if (RTBldProgStrTabQueryString(&g_OidDbStrTab, pBigHit->offString,
                                                        pBigHit->cchString, pszDst, cbDst) >= 0)
-                            return true;
+                            return VINF_SUCCESS;
+                        rc = VERR_BUFFER_OVERFLOW;
                         break;
                     }
@@ -218 +221 @@
     }
 
-    return false;
+    return rc;
+}
+
+
+/**
+ * Queries the name for an object identifier.
+ *
+ * This API is simple and more or less requires a
+ *
+ * @returns IPRT status code.
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_NOT_FOUND if not found.
+ * @retval  VERR_BUFFER_OVERFLOW if more buffer space is required.
+ *
+ * @param   pauComponents   The components making up the object ID.
+ * @param   cComponents     The number of components.
+ * @param   pszDst          Where to store the name if found.
+ * @param   cbDst           The size of the destination buffer.
+ */
+RTDECL(int) RTAsn1QueryObjIdName(PCRTASN1OBJID pObjId, char *pszDst, size_t cbDst)
+{
+    return rtOidDbQueryObjIdName(pObjId->pauComponents, pObjId->cComponents, pszDst, cbDst);
 }
 
@@ -422 +446 @@
                 PCRTASN1OBJID pObjId = (PCRTASN1OBJID)pAsn1Core;
                 char szName[64];
-                if (rtOidDbQueryObjIdName(pObjId->pauComponents, pObjId->cComponents, szName, sizeof(szName)))
+                if (rtOidDbQueryObjIdName(pObjId->pauComponents, pObjId->cComponents, szName, sizeof(szName)) == VINF_SUCCESS)
                     rtAsn1DumpPrintf(pData, "OBJECT IDENTIFIER %s%s ('%s')\n",
                                      pszDefault, szName, ((PCRTASN1OBJID)pAsn1Core)->szObjId);