Changeset 84164 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

May 6, 2020 3:32:25 PM (5 years ago)

Author:

vboxsync

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

137768

Message:

VBoxManage,manual: Use the new RTCrX509Certificate_WriteToVfsFile function to write out the signing certificate. bugref:9699

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp

@@ -1930 +1930 @@
 
 /**
- * Appends the certificate in PEM format to the given VFS file.
- */
-static int doWriteCertificate(RTVFSFILE hVfsFileSignature, PCRTCRX509CERTIFICATE pCertificate)
-{
-    RT_NOREF(hVfsFileSignature, pCertificate);
-    RTPrintf("TODO: doWriteCertificate\n");
-    return VINF_SUCCESS;
-}
-
-
-/**
  * Performs the OVA signing, producing an in-memory cert-file.
  */
-static int doTheOvaSigning(PCRTCRX509CERTIFICATE pCertificate, RTCRKEY hPrivateKey,
+static int doTheOvaSigning(PRTCRX509CERTIFICATE pCertificate, RTCRKEY hPrivateKey,
                            const char *pszManifestName, RTVFSFILE hVfsFileManifest,
                            bool fPkcs7, unsigned cIntermediateCerts, const char **papszIntermediateCerts,
@@ -2017 +2006 @@
                                                  pszDigestType, pszManifestName, cbSignature, pvSignature);
                             if (RT_SUCCESS(rc))
-                                rc = doWriteCertificate(hVfsFileSignature, pCertificate);
+                            {
+                                rc = RTCrX509Certificate_WriteToVfsFile(hVfsFileSignature, pCertificate,
+                                                                        RTErrInfoInitStatic(pErrInfo));
+                                if (RT_SUCCESS(rc))
+                                {
+                                    if (fPkcs7)
+                                        rc = doAddPkcs7Signature(pCertificate, hPrivateKey, cIntermediateCerts,
+                                                                 papszIntermediateCerts, hDigest, pErrInfo, hVfsFileSignature);
+                                    if (RT_SUCCESS(rc))
+                                    {
+                                        /*
+                                         * Success.
+                                         */
+                                        *phVfsFileSignature = hVfsFileSignature;
+                                        hVfsFileSignature = NIL_RTVFSFILE;
+                                    }
+                                }
+                                else
+                                    RTMsgError("Failed to write certificate to signature file: %Rrc%#RTeim", rc, &pErrInfo->Core);
+                            }
                             else
                                 RTMsgError("Failed to produce signature file: %Rrc", rc);
-                            if (RT_SUCCESS(rc) && fPkcs7)
-                                rc = doAddPkcs7Signature(pCertificate, hPrivateKey, cIntermediateCerts, papszIntermediateCerts,
-                                                         hDigest, pErrInfo, hVfsFileSignature);
-                            if (RT_SUCCESS(rc))
-                            {
-                                /*
-                                 * Success.
-                                 */
-                                *phVfsFileSignature = hVfsFileSignature;
-                            }
-                            else
-                                RTVfsFileRelease(hVfsFileSignature);
+                            RTVfsFileRelease(hVfsFileSignature);
                         }
                         else