Changeset 93112 in vbox for trunk/src

Timestamp:

Dec 31, 2021 7:53:03 PM (3 years ago)

Author:

vboxsync

Message:

IPRT/x509-core: Added 'uid'/0.9.2342.19200300.100.1.1 to the g_aRdnMap. Fixed a few clang warnings.

File:

• trunk/src/VBox/Runtime/common/crypto/x509-core.cpp (modified) (8 diffs)

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

@@ -496 +496 @@
             break;
     }
-    *pcch -= pszPrev - pszStart;
+    *pcch -= (size_t)(pszPrev - pszStart);
     return pszPrev;
 }
@@ -532 +532 @@
 
     *ppsz  = pszPrev;
-    *pcch -= pszPrev - pszStart;
+    *pcch -= (size_t)(pszPrev - pszStart);
     return uc;
 }
@@ -542 +542 @@
     {
         const char *psz = *ppsz;
-        RTUNICP uc = *psz;
+        RTUNICP     uc = (RTUNICP)*psz;
         if (uc < 0x80)
         {
@@ -552 +552 @@
             int rc = RTStrGetCpEx(ppsz, &uc);
             AssertRCReturn(rc, uc);
-            size_t cchCp = *ppsz - psz;
+            size_t cchCp = (size_t)(*ppsz - psz);
             AssertReturn(cchCp <= *pcch, 0);
             *pcch -= cchCp;
@@ -766 +766 @@
 } const g_aRdnMap[] =
 {
+    {   "0.9.2342.19200300.100.1.1",  RT_STR_TUPLE("uid"),                  "userid" },
     {   "0.9.2342.19200300.100.1.3",  RT_STR_TUPLE("Mail"),                 "Rfc822Mailbox" },
     {   "0.9.2342.19200300.100.1.25", RT_STR_TUPLE("DC"),                   "DomainComponent" },
@@ -1134 +1135 @@
         if (!pszEnd)
             pszEnd = strchr(pszStart, '\0');
-        if (memchr(pszStart, ':', pszEnd - pszStart))
+        if (memchr(pszStart, ':', (size_t)(pszEnd - pszStart)))
             do
                 pszEnd--;
@@ -1143 +1144 @@
              * Drop access credentials at the front of the string if present.
              */
-            const char *pszAt = (const char *)memchr(pszStart, '@', pszEnd - pszStart);
+            const char *pszAt = (const char *)memchr(pszStart, '@', (size_t)(pszEnd - pszStart));
             if (pszAt)
                 pszStart = pszAt + 1;
@@ -1152 +1153 @@
             if (pszEnd != pszStart)
             {
-                *pcchHostName = pszEnd - pszStart;
+                *pcchHostName = (size_t)(pszEnd - pszStart);
                 *pchHostName  = pszStart;
                 return true;