Changeset 105127 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 3, 2024 10:18:33 PM (9 months ago)

Author:

vboxsync

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

163757

Message:

Certificate repair function fix - bugref:10310

File:

• trunk/src/VBox/Main/src-server/VRDEServerImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-server/VRDEServerImpl.cpp

@@ -290 +290 @@
  * @note Locks this object for writing.
  */
-int VRDEServer::certificateRepair(BOOL &certificateGenerated)
-{
-    int vrc = VINF_SUCCESS;
+HRESULT VRDEServer::i_certificateRepair(BOOL &certificateGenerated)
+{
     if ( (mData->mapProperties["Security/Method"] != "RDP" || mData->mapProperties["Security/Method"] != "None"))
     {
         Utf8Str strServerCertificate("VRDEAutoGeneratedCert.pem");
-        vrc = mParent->i_calculateFullPath(strServerCertificate, strServerCertificate);
-        AssertRCReturn(vrc, vrc);
+        int vrc = mParent->i_calculateFullPath(strServerCertificate, strServerCertificate);
+        AssertRCReturn(vrc, VBOX_E_IPRT_ERROR);
 
         Utf8Str strServerPrivateKey("VRDEAutoGeneratedPrivateKey.pem");
         vrc = mParent->i_calculateFullPath(strServerPrivateKey, strServerPrivateKey);
-        AssertRCReturn(vrc, vrc);
+        AssertRCReturn(vrc, VBOX_E_IPRT_ERROR);
 
         if ( RTFileExists(strServerPrivateKey.c_str()) && RTFileExists(strServerCertificate.c_str()) )
         {
             /* Check validity of certificate */
-            RTCRX509CERTIFICATE pCertificate;
-            BOOL validCert = false;
-            vrc = RTCrX509Certificate_ReadFromFile(&pCertificate, strServerCertificate.c_str(), RTCRX509CERT_READ_F_PEM_ONLY,
+            RTCRX509CERTIFICATE certificate;
+            vrc = RTCrX509Certificate_ReadFromFile(&certificate, strServerCertificate.c_str(), RTCRX509CERT_READ_F_PEM_ONLY,
                                                    &g_RTAsn1DefaultAllocator, NULL);
             if(RT_FAILURE(vrc))
             {
-                RTCrX509Certificate_Delete(&pCertificate);
+                RTCrX509Certificate_Delete(&certificate);
                 return setError(VBOX_E_IPRT_ERROR, tr("Failed to read server certificate: (%Rrc)\n"), vrc);
             }
 
             RTTIMESPEC Now;
-            if ( RTCrX509Validity_IsValidAtTimeSpec(&(&pCertificate)->TbsCertificate.Validity, RTTimeNow(&Now)) )
-                validCert = true;
-
-            RTCrX509Certificate_Delete(&pCertificate);
+            bool const validCert = RTCrX509Validity_IsValidAtTimeSpec(&certificate.TbsCertificate.Validity, RTTimeNow(&Now));
+
+            RTCrX509Certificate_Delete(&certificate);
 
             Utf8Str strPath = mData->mapProperties["Security/ServerCertificate"];
@@ -336 +333 @@
                 alock.release();
                 certificateGenerated = true;
-                RTCrX509Certificate_Delete(&pCertificate);
             }
             else if ( (strPath.isEmpty() || strstr(strPath.c_str(),"VRDEAutoGeneratedCert.pem")) && !validCert)
@@ -346 +342 @@
                 if (RT_FAILURE(vrc))
                 {
-                    RTCrX509Certificate_Delete(&pCertificate);
                     i_rollback();
                     return setError(VBOX_E_IPRT_ERROR, tr("Failed to auto generate server key and certificate: (%Rrc)\n"), vrc);
@@ -395 +390 @@
         }
     }
-    return vrc;
+    return S_OK;
 }
 
@@ -436 +431 @@
         {
             BOOL certificateGenerated = false;
-            int vrc = certificateRepair(certificateGenerated);
+            int vrc = i_certificateRepair(certificateGenerated);
             if (RT_FAILURE(vrc))
                 LogRel((("Failed to auto generate server key and certificate: (%Rrc)\n"), vrc));
@@ -634 +629 @@
     {
         BOOL certificateGenerated = false;
-        int vrc = certificateRepair(certificateGenerated);
+        int vrc = i_certificateRepair(certificateGenerated);
         if ( RT_FAILURE(vrc) )
             LogRel((("Failed to auto generate server key and certificate: (%Rrc)\n"), vrc));