Changeset 64817 in vbox

Timestamp:

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

Author:

vboxsync

Message:

IPRT: Added RTAsn1QueryObjIdName and RTCrDigestTypeToName.

Location:

trunk

Files:

• include/iprt/asn1.h (modified) (1 diff)
• include/iprt/crypto/digest.h (modified) (1 diff)
• include/iprt/mangling.h (modified) (2 diffs)
• src/VBox/Runtime/common/asn1/asn1-dump.cpp (modified) (7 diffs)
• src/VBox/Runtime/common/crypto/digest-core.cpp (modified) (1 diff)

trunk/include/iprt/asn1.h

@@ -2084 +2084 @@
 RTDECL(int) RTAsn1Dump(PCRTASN1CORE pAsn1Core, uint32_t fFlags, uint32_t uLevel, PFNRTDUMPPRINTFV pfnPrintfV, void *pvUser);
 
+/**
+ * Queries the name for an object identifier.
+ *
+ * This API is very simple due to how we store the data.
+ *
+ * @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);
+
 /** @} */
 

trunk/include/iprt/crypto/digest.h

@@ -205 +205 @@
 RTDECL(const char *) RTCrDigestTypeToAlgorithmOid(RTDIGESTTYPE enmDigestType);
 
+/**
+ * Translates an IPRT digest type value to a name/descriptive string.
+ *
+ * The purpose here is for human readable output rather than machine readable
+ * output, i.e. the names aren't set in stone.
+ *
+ * @returns Pointer to read-only string, NULL if unknown type.
+ * @param       enmDigestType       The IPRT digest type value to convert.
+ */
+RTDECL(const char *) RTCrDigestTypeToName(RTDIGESTTYPE enmDigestType);
+
 /** @} */
 

trunk/include/iprt/mangling.h

@@ -2442 +2442 @@
 # define RTAsn1CursorSetInfoV                           RT_MANGLER(RTAsn1CursorSetInfoV)
 # define RTAsn1Dump                                     RT_MANGLER(RTAsn1Dump)
+# define RTAsn1QueryObjIdName                           RT_MANGLER(RTAsn1QueryObjIdName)
 # define RTAsn1EncodePrepare                            RT_MANGLER(RTAsn1EncodePrepare)
 # define RTAsn1EncodeRecalcHdrSize                      RT_MANGLER(RTAsn1EncodeRecalcHdrSize)
@@ -2776 +2777 @@
 # define RTCrDigestFindByType                           RT_MANGLER(RTCrDigestFindByType)
 # define RTCrDigestTypeToAlgorithmOid                   RT_MANGLER(RTCrDigestTypeToAlgorithmOid)
+# define RTCrDigestTypeToName                           RT_MANGLER(RTCrDigestTypeToName)
 # define RTCrRsaDigestInfo_DecodeAsn1                   RT_MANGLER(RTCrRsaDigestInfo_DecodeAsn1)
 # define RTCrRsaOtherPrimeInfo_DecodeAsn1               RT_MANGLER(RTCrRsaOtherPrimeInfo_DecodeAsn1)

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);

trunk/src/VBox/Runtime/common/crypto/digest-core.cpp

@@ -398 +398 @@
 }
 
+
+RTDECL(const char *) RTCrDigestTypeToName(RTDIGESTTYPE enmDigestType)
+{
+    switch (enmDigestType)
+    {
+        case RTDIGESTTYPE_CRC32:        return "CRC32";
+        case RTDIGESTTYPE_CRC64:        return "CRC64";
+        case RTDIGESTTYPE_MD2:          return "MD2";
+        case RTDIGESTTYPE_MD4:          return "MD4";
+        case RTDIGESTTYPE_MD5:          return "MD5";
+        case RTDIGESTTYPE_SHA1:         return "SHA-1";
+        case RTDIGESTTYPE_SHA224:       return "SHA-224";
+        case RTDIGESTTYPE_SHA256:       return "SHA-256";
+        case RTDIGESTTYPE_SHA384:       return "SHA-384";
+        case RTDIGESTTYPE_SHA512:       return "SHA-512";
+        case RTDIGESTTYPE_SHA512T224:   return "SHA-512/224";
+        case RTDIGESTTYPE_SHA512T256:   return "SHA-512/256";
+        default:                        return NULL;
+    }
+}
+