Changeset 62221 in vbox for trunk/src/VBox

Timestamp:

Jul 13, 2016 2:47:50 PM (9 years ago)

Author:

vboxsync

Message:

Appliance::i_readSignatureFile: RTCrX509Certificate_ReadFromBuffer must treat the cert-file as a PEM file, never a binary. Added dedicated message for cert-files missing the signer's certificate.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (2 diffs)

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

@@ -1587 +1587 @@
      */
     RTERRINFOSTATIC StaticErrInfo;
-    vrc = RTCrX509Certificate_ReadFromBuffer(&m->SignerCert, pvSignature, cbSignature, 0 /*fFlags*/,
+    vrc = RTCrX509Certificate_ReadFromBuffer(&m->SignerCert, pvSignature, cbSignature,
+                                             RTCRX509CERT_READ_F_PEM_ONLY,
                                              &g_RTAsn1DefaultAllocator, RTErrInfoInitStatic(&StaticErrInfo), pszSubFileNm);
     HRESULT hrc;
@@ -1690 +1691 @@
             hrc = E_OUTOFMEMORY;
     }
+    else if (vrc == VERR_NOT_FOUND || vrc == VERR_EOF)
+        hrc = setErrorBoth(E_FAIL, vrc, tr("Malformed .cert-file for '%s': Signer's certificate not found (%Rrc)"),
+                           pTask->locInfo.strPath.c_str(), vrc);
     else
         hrc = setErrorVrc(vrc, tr("Error reading the signer's certificate from '%s' for '%s' (%Rrc): %s"),