Changeset 60028 in vbox

Timestamp:

Mar 15, 2016 10:39:16 AM (9 years ago)

Author:

vboxsync

Message:

iprt: Added simple (and untested) RTAsn1Integer_ToString implemented. Added spacing flags to RTStrPrintHexBytes (also untested).

Location:

trunk

Files:

• include/iprt/asn1.h (modified) (1 diff)
• include/iprt/mangling.h (modified) (1 diff)
• include/iprt/string.h (modified) (2 diffs)
• src/VBox/Runtime/common/asn1/asn1-ut-integer.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/string/RTStrPrintHexBytes.cpp (modified) (3 diffs)

trunk/include/iprt/asn1.h

@@ -831 +831 @@
 RTDECL(int) RTAsn1Integer_FromBigNum(PRTASN1INTEGER pThis, PCRTBIGNUM pBigNum, PCRTASN1ALLOCATORVTABLE pAllocator);
 
+/**
+ * Converts the integer to a string.
+ *
+ * This will produce a hex represenation of the number.  If it fits in 64-bit, a
+ * C style hex number will be produced.  If larger than 64-bit, it will be
+ * printed as a space separated string of hex bytes.
+ *
+ * @returns IPRT status code.
+ * @param   pThis               The ASN.1 integer.
+ * @param   pszBuf              The output buffer.
+ * @param   cbBuf               The buffer size.
+ * @param   fFlags              Flags reserved for future exploits. MBZ.
+ * @param   pcbActual           Where to return the amount of buffer space used
+ *                              (i.e. including terminator). Optional.
+ *
+ * @remarks Currently assume unsigned number.
+ */
+RTDECL(int) RTAsn1Integer_ToString(PRTASN1INTEGER pThis, char *pszBuf, size_t cbBuf, uint32_t fFlags, size_t *pcbActual);
+
 RTASN1_IMPL_GEN_SEQ_OF_TYPEDEFS_AND_PROTOS(RTASN1SEQOFINTEGERS, RTASN1INTEGER, RTDECL, RTAsn1SeqOfIntegers);
 RTASN1_IMPL_GEN_SET_OF_TYPEDEFS_AND_PROTOS(RTASN1SETOFINTEGERS, RTASN1INTEGER, RTDECL, RTAsn1SetOfIntegers);

trunk/include/iprt/mangling.h

@@ -2484 +2484 @@
 # define RTAsn1Integer_InitU64                          RT_MANGLER(RTAsn1Integer_InitU64)
 # define RTAsn1Integer_ToBigNum                         RT_MANGLER(RTAsn1Integer_ToBigNum)
+# define RTAsn1Integer_ToString                         RT_MANGLER(RTAsn1Integer_ToString)
 # define RTAsn1Integer_UnsignedCompare                  RT_MANGLER(RTAsn1Integer_UnsignedCompare)
 # define RTAsn1Integer_UnsignedCompareWithU32           RT_MANGLER(RTAsn1Integer_UnsignedCompareWithU32)

trunk/include/iprt/string.h

@@ -2828 +2828 @@
  *
  * @param   pszBuf      Output string buffer.
- * @param   cchBuf      The size of the output buffer.
+ * @param   cbBuf       The size of the output buffer.
  * @param   pv          Pointer to the bytes to stringify.
  * @param   cb          The number of bytes to stringify.
@@ -2834 +2834 @@
  * @sa      RTUtf16PrintHexBytes.
  */
-RTDECL(int) RTStrPrintHexBytes(char *pszBuf, size_t cchBuf, void const *pv, size_t cb, uint32_t fFlags);
+RTDECL(int) RTStrPrintHexBytes(char *pszBuf, size_t cbBuf, void const *pv, size_t cb, uint32_t fFlags);
 /** @name RTSTRPRINTHEXBYTES_F_XXX - flags for RTStrPrintHexBytes and RTUtf16PritnHexBytes.
  * @{ */
 /** Upper case hex digits, the default is lower case. */
 #define RTSTRPRINTHEXBYTES_F_UPPER      RT_BIT(0)
+/** Add a space between each group. */
+#define RTSTRPRINTHEXBYTES_F_SEP_SPACE  RT_BIT(1)
+/** Add a colon between each group. */
+#define RTSTRPRINTHEXBYTES_F_SEP_COLON  RT_BIT(2)
 /** @} */
 

trunk/src/VBox/Runtime/common/asn1/asn1-ut-integer.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2015 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -338 +338 @@
 
 
+RTDECL(int) RTAsn1Integer_ToString(PRTASN1INTEGER pThis, char *pszBuf, size_t cbBuf, uint32_t fFlags, size_t *pcbActual)
+{
+    AssertReturn(RTAsn1Integer_IsPresent(pThis), VERR_INVALID_PARAMETER);
+    AssertReturn(fFlags == 0, VERR_INVALID_FLAGS);
+
+    /*
+     * We only do hex conversions via this API.
+     * Currently we consider all numbers to be unsigned.
+     */
+    /** @todo Signed ASN.1 INTEGER. */
+    int rc;
+    size_t cbActual;
+    if (pThis->Asn1Core.cb <= 8)
+    {
+        cbActual = 2 + pThis->Asn1Core.cb*2 + 1;
+        if (cbActual <= cbBuf)
+        {
+            ssize_t cchFormat = RTStrFormatU64(pszBuf, cbBuf, pThis->uValue.u, 16, cbActual - 1 /*cchWidth*/, 0,
+                                               RTSTR_F_SPECIAL | RTSTR_F_ZEROPAD);
+            AssertStmt(cchFormat == (ssize_t)cbActual - 1, rc = VERR_INTERNAL_ERROR_3);
+        }
+        else
+            rc = VERR_BUFFER_OVERFLOW;
+    }
+    else
+    {
+        cbActual = pThis->Asn1Core.cb * 3 - 1 /* save one separator */ + 1 /* terminator */;
+        if (cbActual <= cbBuf)
+        {
+            rc = RTStrPrintHexBytes(pszBuf, cbBuf, pThis->Asn1Core.uData.pv, pThis->Asn1Core.cb, RTSTRPRINTHEXBYTES_F_SEP_SPACE);
+            Assert(rc == VINF_SUCCESS);
+        }
+        else
+            rc = VERR_BUFFER_OVERFLOW;
+    }
+    if (pcbActual)
+        *pcbActual = cbActual;
+    return rc;
+}
+
 
 /*

trunk/src/VBox/Runtime/common/string/RTStrPrintHexBytes.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2015 Oracle Corporation
+ * Copyright (C) 2009-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -36 +36 @@
 
 
-RTDECL(int) RTStrPrintHexBytes(char *pszBuf, size_t cchBuf, void const *pv, size_t cb, uint32_t fFlags)
+RTDECL(int) RTStrPrintHexBytes(char *pszBuf, size_t cbBuf, void const *pv, size_t cb, uint32_t fFlags)
 {
-    AssertReturn(!(fFlags & ~RTSTRPRINTHEXBYTES_F_UPPER), VERR_INVALID_PARAMETER);
+    AssertReturn(   !(fFlags & ~(RTSTRPRINTHEXBYTES_F_UPPER | RTSTRPRINTHEXBYTES_F_SEP_SPACE | RTSTRPRINTHEXBYTES_F_SEP_COLON))
+                 &&    (fFlags & (RTSTRPRINTHEXBYTES_F_SEP_SPACE | RTSTRPRINTHEXBYTES_F_SEP_COLON))
+                    != (RTSTRPRINTHEXBYTES_F_SEP_SPACE | RTSTRPRINTHEXBYTES_F_SEP_COLON),
+                 VERR_INVALID_FLAGS);
     AssertPtrReturn(pszBuf, VERR_INVALID_POINTER);
     AssertReturn(cb * 2 >= cb, VERR_BUFFER_OVERFLOW);
-    AssertReturn(cchBuf >= cb * 2 + 1, VERR_BUFFER_OVERFLOW);
+    char const chSep = fFlags & RTSTRPRINTHEXBYTES_F_SEP_SPACE ? ' '
+                     : fFlags & RTSTRPRINTHEXBYTES_F_SEP_COLON ? ':' : '\0';
+    AssertReturn(cbBuf >= cb * (2 + (chSep != '\0')) - (chSep != '\0') + 1, VERR_BUFFER_OVERFLOW);
     if (cb)
         AssertPtrReturn(pv, VERR_INVALID_POINTER);
@@ -50 +55 @@
 
     uint8_t const *pb = (uint8_t const *)pv;
-    while (cb-- > 0)
+
+    if (!chSep)
+    {
+        while (cb-- > 0)
+        {
+            uint8_t b = *pb++;
+            *pszBuf++ = pszHexDigits[b >> 4];
+            *pszBuf++ = pszHexDigits[b & 0xf];
+        }
+    }
+    else if (cb-- > 0)
     {
         uint8_t b = *pb++;
         *pszBuf++ = pszHexDigits[b >> 4];
         *pszBuf++ = pszHexDigits[b & 0xf];
+
+        while (cb-- > 0)
+        {
+            b = *pb++;
+            *pszBuf++ = chSep;
+            *pszBuf++ = pszHexDigits[b >> 4];
+            *pszBuf++ = pszHexDigits[b & 0xf];
+        }
     }
+
     *pszBuf = '\0';
     return VINF_SUCCESS;