Changeset 50887 in vbox for trunk/src

Timestamp:

Mar 26, 2014 12:55:14 PM (11 years ago)

Author:

vboxsync

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

92990

Message:

Put a warning instead an error if X509 certificate is not self-signed

Location:

trunk/src/VBox

Files:

• Main/src-server/ApplianceImplImport.cpp (modified) (2 diffs)
• Runtime/common/checksum/x509.cpp (modified) (1 diff)

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

@@ -2103 +2103 @@
         if (RT_SUCCESS(vrc))
         {
+            /*
+             * possible step in the future. Not obligatory due to OVF2.0 standard
+             * OVF2.0:"A consumer of the OVF package shall verify the signature and should validate the certificate"
+             */
             vrc = RTX509CertificateVerify(pvCertBuf, (unsigned int)cbCertSize);
         }
@@ -2157 +2161 @@
                         errStrDesc = "X509 certificate verification failure ";
                         break;
-                    case VERR_NOT_SELFSIGNED_X509_CERTIFICATE:
-                        errStrDesc = "Only self signed X509 certificates are supported at moment";
-                        break;
                     default:
                         errStrDesc = "Unknown error during X509 certificate verification";
                 }
                 rc = setError(VBOX_E_FILE_ERROR, tr(errStrDesc.c_str()));
+            }
+        }
+        else
+        {
+            if(vrc == VINF_NOT_SELFSIGNED_X509_CERTIFICATE)
+            {
+                setWarning(VBOX_E_FILE_ERROR, 
+                           tr("Signature from the X509 certificate has been verified. "
+                              "But VirtualBox can't validate the given X509 certificate. "
+                              "Only self signed X509 certificates are supported at moment. \n"));
             }
         }

trunk/src/VBox/Runtime/common/checksum/x509.cpp

@@ -362 +362 @@
                     rc = VERR_X509_CERTIFICATE_VERIFICATION_FAILURE;
             }
+            else
+            {
+                rc = VINF_NOT_SELFSIGNED_X509_CERTIFICATE;
+            }
         }
         else
         {
-            rc = VERR_NOT_SELFSIGNED_X509_CERTIFICATE;
+            rc = VINF_NOT_SELFSIGNED_X509_CERTIFICATE;
         }