Changeset 57616 in vbox for trunk/src/VBox/Frontends

Timestamp:

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

Author:

vboxsync

Message:

IPRT,UINetworkReply: Build & bug fixes.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp (modified) (8 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;
                         }