Changeset 57624 in vbox

Timestamp:

Sep 4, 2015 11:40:41 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

102501

Message:

IPRT,UINetworkReply: Fixes, logging.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/net/UINetworkReply.cpp (modified) (2 diffs)
• Runtime/common/misc/http.cpp (modified) (2 diffs)

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

@@ -583 +583 @@
         if (RTErrInfoIsSet(&StaticErrInfo.Core))
             LogRel(("refreshCertificates/#1: %s\n", StaticErrInfo.Core.pszMsg));
+        else if (rc == VERR_NOT_FOUND)
+            LogRel(("refreshCertificates/#1: No trusted SSL certs found on the system, will try download...\n"));
         else
             AssertLogRelRC(rc);
-
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(rc) || rc == VERR_NOT_FOUND)
         {
             /*
@@ -643 +644 @@
                 rc = RTCrStoreCertExportAsPem(hNewStore, 0 /*fFlags*/, pszCaCertFile);
                 if (RT_SUCCESS(rc))
+                {
                     memcpy(pafOldFoundCerts, afNewFoundCerts, sizeof(afNewFoundCerts));
+                    LogRel(("refreshCertificates/#3: Found %u/%u SSL certs we/you trust (previously %u/%u).\n",
+                            countCertsFound(afNewFoundCerts), RTCrStoreCertCount(hNewStore),
+                            countCertsFound(pafOldFoundCerts), RTCrStoreCertCount(hOldStore) ));
+                }
                 else
+                {
                     RT_ZERO(pafOldFoundCerts);
+                    LogRel(("refreshCertificates/#3: RTCrStoreCertExportAsPem unexpectedly failed with %Rrc\n", rc));
+                }
             }
+            else
+                LogRel(("refreshCertificates/#3: Sticking with the old file, missing essential certs.\n"));
         }
         RTCrStoreRelease(hNewStore);

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

@@ -434 +434 @@
      * Ditto for the system store.
      */
-    int rcSystem = RTCrStoreCreateSnapshotById(&hSrcStore, RTCRSTOREID_USER_TRUSTED_CAS_AND_CERTIFICATES, pErrInfo);
+    int rcSystem = RTCrStoreCreateSnapshotById(&hSrcStore, RTCRSTOREID_SYSTEM_TRUSTED_CAS_AND_CERTIFICATES, pErrInfo);
     if (RT_SUCCESS(rcSystem))
     {
@@ -457 +457 @@
         return rcSystem;
     if (RT_FAILURE(rcUser))
-        return rcSystem;
+        return rcUser;
     return VERR_NOT_FOUND;
 }