Changeset 57616 in vbox

Timestamp:

Sep 4, 2015 3:39:39 AM (9 years ago)

Author:

vboxsync

Message:

IPRT,UINetworkReply: Build & bug fixes.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/net/UINetworkReply.cpp (modified) (8 diffs)
• Runtime/common/crypto/RTCrStoreCertAddWantedFromFishingExpedition.cpp (modified) (3 diffs)
• Runtime/common/crypto/store-cert-add-basic.cpp (modified) (3 diffs)
• Runtime/common/misc/http.cpp (modified) (6 diffs)
• Runtime/common/path/RTPathGlob.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp

@@ -107 +107 @@
     static unsigned countCertsFound(bool const *pafFoundCerts);
     static bool areAllCertsFound(bool const *pafFoundCerts, bool fOnlyMandatory);
+    static int  adjustCertsFound(int rc, bool *pafFoundCerts);
     static void refreshCertificates(RTHTTP hHttp, RTCRSTORE hOldStore, bool *pafFoundCerts, const char *pszCaCertFile);
     static void downloadMissingCertificates(RTCRSTORE hNewStore, bool *pafNewFoundCerts, RTHTTP hHttp,
@@ -342 +343 @@
              */
             rc = RTCrStoreCertCheckWanted(hCurStore, s_aCerts, RT_ELEMENTS(s_aCerts), afCertsFound);
+            rc = adjustCertsFound(rc, afCertsFound);
             AssertRC(rc);
             RTTIMESPEC RefreshAge;
@@ -485 +487 @@
     /* Apply HTTP headers: */
     return RTHttpSetHeaders(hHttp, formattedHeaderPointers.size(), ppFormattedHeaders);
+}
+
+/**
+ * Adjusts the set of found certificates by marking all alternatives found if
+ * one is.
+ *
+ * @returns Adjusted rc (VINF_SUCCESS instead of VWRN_NOT_FOUND if all found).
+ * @param   rc                  The status code.
+ * @param   pafFoundCerts       Array parallel to s_aCerts with the status of
+ *                              each wanted certificate.
+ */
+/*static*/ int
+UINetworkReplyPrivateThread::adjustCertsFound(int rc, bool *pafFoundCerts)
+{
+    for (uint32_t i = 0; i < RT_ELEMENTS(s_aCerts); i++)
+        if (pafFoundCerts[i])
+        {
+            uint8_t iAlt = i;
+            for (;;)
+            {
+                const CERTINFO *pCertInfo = (const CERTINFO *)s_aCerts[iAlt].pvUser;
+                iAlt = pCertInfo->iAlternativeTo;
+                if (iAlt >= RT_ELEMENTS(s_aCerts) || iAlt == i)
+                {
+                    Assert(iAlt == UINT8_MAX || iAlt < RT_ELEMENTS(s_aCerts));
+                    break;
+                }
+                if (!pafFoundCerts[iAlt])
+                    pafFoundCerts[iAlt] = true;
+            }
+        }
+
+    if (rc == VINF_SUCCESS || rc == VWRN_NOT_FOUND)
+        rc = countCertsFound(pafFoundCerts) == RT_ELEMENTS(s_aCerts) ? VINF_SUCCESS : VWRN_NOT_FOUND;
+    return rc;
 }
 
@@ -559 +596 @@
 
             rc = RTCrStoreCertCheckWanted(hNewStore, s_aCerts, RT_ELEMENTS(s_aCerts), afNewFoundCerts);
+            rc = adjustCertsFound(rc, afNewFoundCerts);
             AssertLogRelRC(rc);
             Assert(rc != VINF_SUCCESS || areAllCertsFound(afNewFoundCerts, false /*fOnlyMandatory*/));
@@ -566 +604 @@
                                                      RTCRCERTCTX_F_ADD_IF_NOT_FOUND | RTCRCERTCTX_F_ADD_CONTINUE_ON_ERROR,
                                                      hOldStore, s_aCerts, RT_ELEMENTS(s_aCerts), afNewFoundCerts);
+                rc = adjustCertsFound(rc, afNewFoundCerts);
                 AssertLogRelRC(rc);
                 Assert(rc != VINF_SUCCESS || areAllCertsFound(afNewFoundCerts, false /*fOnlyMandatory*/));
@@ -581 +620 @@
                                                                  s_aCerts, RT_ELEMENTS(s_aCerts), afNewFoundCerts,
                                                                  RTErrInfoInitStatic(&StaticErrInfo));
+                rc = adjustCertsFound(rc, afNewFoundCerts);
                 if (RTErrInfoIsSet(&StaticErrInfo.Core))
                     LogRel(("refreshCertificates/#2: %s\n", StaticErrInfo.Core.pszMsg));
@@ -652 +692 @@
                                  */
                                 pafNewFoundCerts[i] = true;
-                                if (areAllCertsFound(pafNewFoundCerts, false /* fOnlyMandatory */))
+                                if (adjustCertsFound(VWRN_NOT_FOUND, pafNewFoundCerts) == VINF_SUCCESS)
                                 {
                                     RTHttpFreeResponse(pvRootsZip);
@@ -685 +725 @@
                         {
                             pafNewFoundCerts[i] = true;
+                            adjustCertsFound(VWRN_NOT_FOUND, pafNewFoundCerts);
                             break;
                         }

trunk/src/VBox/Runtime/common/crypto/RTCrStoreCertAddWantedFromFishingExpedition.cpp

@@ -146 +146 @@
 #endif
 #ifdef RT_OS_WINDOWS
-            "${BothProgramFiles}/Git/bin/curl-ca-bundle.crt",
-            "${BothProgramFiles}/Mercurial/hgrc.d/cacert.pem",
-            "${BothProgramFiles}/Java/jre*/lib/security/cacerts",
-            "${BothProgramFiles}/Java/jdk*/jre/lib/security/cacerts",
-            "${BothProgramFiles}/HexChat/cert.pem",
+            "${AllProgramFiles}/Git/bin/curl-ca-bundle.crt",
+            "${AllProgramFiles}/Mercurial/hgrc.d/cacert.pem",
+            "${AllProgramFiles}/Java/jre*/lib/security/cacerts",
+            "${AllProgramFiles}/Java/jdk*/jre/lib/security/cacerts",
+            "${AllProgramFiles}/HexChat/cert.pem",
             "${SystemDrive}/BitNami/*/git/bin/curl-ca-bundle.crt",
             "${SystemDrive}/BitNami/*/heroku/data/cacert.pem",
@@ -187 +187 @@
 #endif
 #ifdef RT_OS_WINDOWS
-            "${BothProgramFiles}/Git/ssl/certs/",
-            "${BothProgramFiles}/Git/ssl/certs/expired/",
-            "${BothProgramFiles}/Common Files/Apple/Internet Services/security.resources/roots/",
-            "${BothProgramFiles}/Raptr/ca-certs/",
+            "${AllProgramFiles}/Git/ssl/certs/",
+            "${AllProgramFiles}/Git/ssl/certs/expired/",
+            "${AllProgramFiles}/Common Files/Apple/Internet Services/security.resources/roots/",
+            "${AllProgramFiles}/Raptr/ca-certs/",
             "${SystemDrive}/Bitname/*/git/ssl/certs/",
             "${SystemDrive}/Bitnami/*/git/ssl/certs/expired/",
@@ -220 +220 @@
     {
         size_t cFound = rtCrStoreCountFound(pafFound, cWanted);
-        Assert(cFound == cWanted || fAllFound);
+        Assert(cFound == cWanted || !fAllFound);
         if (cFound == cWanted)
             rc = VINF_SUCCESS;

trunk/src/VBox/Runtime/common/crypto/store-cert-add-basic.cpp

@@ -281 +281 @@
                 RTSha1(pCertCtx->pabEncoded, pCertCtx->cbEncoded, abSha1);
                 uint8_t abSha512[RTSHA512_HASH_SIZE];
-                RTSha1(pCertCtx->pabEncoded, pCertCtx->cbEncoded, abSha512);
+                RTSha512(pCertCtx->pabEncoded, pCertCtx->cbEncoded, abSha512);
                 if (rtCrStoreIsCertWanted(paWanted, cWanted, pafFound, pCertCtx->cbEncoded, abSha1, abSha512, pCertCtx->pCert))
                 {
@@ -373 +373 @@
                 RTSha1(pCertCtx->pabEncoded, pCertCtx->cbEncoded, abSha1);
                 uint8_t abSha512[RTSHA512_HASH_SIZE];
-                RTSha1(pCertCtx->pabEncoded, pCertCtx->cbEncoded, abSha512);
+                RTSha512(pCertCtx->pabEncoded, pCertCtx->cbEncoded, abSha512);
                 if (rtCrStoreMarkCertFound(pafFound, paWanted, cWanted, pCertCtx->cbEncoded, abSha1, abSha512, pCertCtx->pCert))
                 {
@@ -528 +528 @@
                     RTSha1(pCurSec->pbData, pCurSec->cbData, abSha1);
                     uint8_t abSha512[RTSHA512_HASH_SIZE];
-                    RTSha1(pCurSec->pbData, pCurSec->cbData, abSha512);
+                    RTSha512(pCurSec->pbData, pCurSec->cbData, abSha512);
                     if (!rtCrStoreIsCertWanted(paWanted, cWanted, pafFound, pCurSec->cbData, abSha1, abSha512, NULL))
                         continue;

trunk/src/VBox/Runtime/common/misc/http.cpp

@@ -559 +559 @@
                 rc = VERR_HTTP_PROXY_NOT_FOUND;
                 break;
+            case CURLE_WRITE_ERROR:
+                rc = RT_FAILURE_NP(pThis->rcOutput) ? pThis->rcOutput : VERR_WRITE_ERROR;
+                break;
+            //case CURLE_READ_ERROR
+
             default:
                 break;
@@ -672 +677 @@
             pThis->Output.Mem.cb = cbNewSize;
             pThis->Output.Mem.pb[cbNewSize] = '\0';
-            return VINF_SUCCESS;
+            return cbToAppend;
         }
 
@@ -693 +698 @@
             pThis->Output.Mem.pb = pbNew;
             pThis->Output.Mem.cb = cbNewSize;
-            return VINF_SUCCESS;
+            return cbToAppend;
         }
 
@@ -699 +704 @@
     }
     else
-        pThis->rcOutput      = VERR_TOO_MUCH_DATA;
+        pThis->rcOutput = VERR_TOO_MUCH_DATA;
 
     /*
@@ -743 +748 @@
      */
     bool fBusy = ASMAtomicXchgBool(&pThis->fBusy, true);
-    AssertReturn(fBusy, VERR_WRONG_ORDER);
+    AssertReturn(!fBusy, VERR_WRONG_ORDER);
 
     /*
@@ -846 +851 @@
      */
     bool fBusy = ASMAtomicXchgBool(&pThis->fBusy, true);
-    AssertReturn(fBusy, VERR_WRONG_ORDER);
+    AssertReturn(!fBusy, VERR_WRONG_ORDER);
 
     /*

trunk/src/VBox/Runtime/common/path/RTPathGlob.cpp

@@ -49 +49 @@
 # define INCL_BASE
 # include <os2.h>
+# undef RT_MAX /* collision */
 
 #endif
@@ -510 +511 @@
                 pszBuf[1] = ':';
                 pszBuf[2] = '\0';
+                *pcchValue = 2;
                 return VINF_EOF;
             }
@@ -523 +525 @@
             pszBuf[1] = ':';
             pszBuf[2] = '\0';
+            *pcchValue = 2;
             return VINF_EOF;
         }
@@ -547 +550 @@
         UINT cchSystemRoot = GetSystemWindowsDirectoryW(wszSystemRoot, MAX_PATH);
         if (cchSystemRoot > 0)
-            return RTUtf16ToUtf8Ex(wszSystemRoot, cchSystemRoot, &pszBuf, cbBuf, NULL);
+            return RTUtf16ToUtf8Ex(wszSystemRoot, cchSystemRoot, &pszBuf, cbBuf, pcchValue);
         return RTErrConvertFromWin32(GetLastError());
     }
@@ -1029 +1032 @@
         if (pAllocator->iNext >= pAllocator->cAllocated)
         {
-            uint32_t cNew = RT_MAX(pAllocator->cAllocated, 1) * 2;
+            uint32_t cNew = pAllocator->cAllocated ? pAllocator->cAllocated * 2 : 2;
             void *pvNew = RTMemRealloc(pAllocator->paInstructions, cNew * sizeof(pAllocator->paInstructions[0]));
             AssertReturn(pvNew, VERR_NO_MEMORY);
@@ -1058 +1061 @@
              * Zero or more characters wildcard.
              */
-            /** @todo bitmap optimziation (index = ch).   */
             if (ch == '*')
             {