Changeset 73312 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jul 23, 2018 10:06:18 AM (6 years ago)

Author:

vboxsync

Message:

IPRT/crypto: Check content size in RTCrStoreCertAddFromFile() and RTCrStoreCertAddWantedFromFile().

File:

• trunk/src/VBox/Runtime/common/crypto/store-cert-add-basic.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/crypto/store-cert-add-basic.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -413 +413 @@
          * No assume PEM or DER encoded binary certificate.
          */
-        else
+        else if (cbContent)
         {
             PCRTCRPEMSECTION pSectionHead;
@@ -442 +442 @@
             }
         }
+        else /* Will happen if proxy not set / no connection available. */
+            rc = RTErrInfoSetF(pErrInfo, VERR_EOF, "Certificate '%s' is empty", pszFilename);
         RTFileReadAllFree(pvContent, cbContent);
     }
@@ -508 +510 @@
          * No assume PEM or DER encoded binary certificate.  Inspect them one by one.
          */
-        else
+        else if (cbContent)
         {
             PCRTCRPEMSECTION pSectionHead;
@@ -593 +595 @@
             }
         }
+        else /* Will happen if proxy not set / no connection available. */
+            rc = RTErrInfoSetF(pErrInfo, VERR_EOF, "Certificate '%s' is empty", pszFilename);
         RTFileReadAllFree(pvContent, cbContent);
     }