Changeset 62220 in vbox for trunk/src/VBox/Runtime/common/crypto

Timestamp:

Jul 13, 2016 2:46:31 PM (8 years ago)

Author:

vboxsync

Message:

IPRT: PEM+X.509: Added PEM_ONLY flags to the reader functions to allow disabling the auto fallback to binary data.

Location:

trunk/src/VBox/Runtime/common/crypto

Files:

• pemfile.cpp (modified) (6 diffs)
• x509-file.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/crypto/pemfile.cpp

@@ -263 +263 @@
  * @param   pbFile              The file bytes to scan.
  * @param   cbFile              The number of bytes.
+ * @param   fFlags              RTCRPEMREADFILE_F_XXX
  */
-static bool rtCrPemIsBinaryBlob(uint8_t const *pbFile, size_t cbFile)
-{
+static bool rtCrPemIsBinaryBlob(uint8_t const *pbFile, size_t cbFile, uint32_t fFlags)
+{
+    if (fFlags & RTCRPEMREADFILE_F_ONLY_PEM)
+        return false;
+
     /*
      * Well formed PEM files should probably only contain 7-bit ASCII and
@@ -338 +342 @@
     AssertPtr(pvContent);
     AssertPtr(paMarkers);
+    AssertReturn(!(fFlags & ~RTCRPEMREADFILE_F_VALID_MASK), VERR_INVALID_FLAGS);
 
     /*
@@ -352 +357 @@
         size_t          offBegin, offEnd, offResume;
         PCRTCRPEMMARKER pMatch;
-        if (   !rtCrPemIsBinaryBlob(pbContent, cbContent)
+        if (   !rtCrPemIsBinaryBlob(pbContent, cbContent, fFlags)
             && rtCrPemFindMarkerSection(pbContent, cbContent, 0 /*offStart*/, paMarkers, cMarkers,
                                         &pMatch, &offBegin, &offEnd, &offResume) )
@@ -407 +412 @@
             RTCrPemFreeSections(*ppSectionHead);
         }
-        else
+        else if (!(fFlags & RTCRPEMREADFILE_F_ONLY_PEM))
         {
             /*
@@ -427 +432 @@
             RTMemFree(pSection);
         }
+        else
+            rc = VWRN_NOT_FOUND;
     }
     else
@@ -439 +446 @@
 {
     *ppSectionHead = NULL;
-    AssertReturn(!(fFlags & ~RTCRPEMREADFILE_F_CONTINUE_ON_ENCODING_ERROR), VERR_INVALID_FLAGS);
+    AssertReturn(!(fFlags & ~RTCRPEMREADFILE_F_VALID_MASK), VERR_INVALID_FLAGS);
 
     size_t      cbContent;

trunk/src/VBox/Runtime/common/crypto/x509-file.cpp

@@ -54 +54 @@
                                              PCRTASN1ALLOCATORVTABLE pAllocator, PRTERRINFO pErrInfo)
 {
-    AssertReturn(!fFlags, VERR_INVALID_FLAGS);
+    AssertReturn(!(fFlags & ~RTCRX509CERT_READ_F_PEM_ONLY), VERR_INVALID_FLAGS);
     PCRTCRPEMSECTION pSectionHead;
-    int rc = RTCrPemReadFile(pszFilename, 0, g_aRTCrX509CertificateMarkers, g_cRTCrX509CertificateMarkers,
+    int rc = RTCrPemReadFile(pszFilename,
+                             fFlags & RTCRX509CERT_READ_F_PEM_ONLY ? RTCRPEMREADFILE_F_ONLY_PEM : 0,
+                             g_aRTCrX509CertificateMarkers, g_cRTCrX509CertificateMarkers,
                              &pSectionHead, pErrInfo);
     if (RT_SUCCESS(rc))
     {
-        RTCRX509CERTIFICATE TmpCert;
-        RTASN1CURSORPRIMARY PrimaryCursor;
-        RTAsn1CursorInitPrimary(&PrimaryCursor, pSectionHead->pbData, (uint32_t)RT_MIN(pSectionHead->cbData, UINT32_MAX),
-                                pErrInfo, pAllocator, RTASN1CURSOR_FLAGS_DER, RTPathFilename(pszFilename));
-        rc = RTCrX509Certificate_DecodeAsn1(&PrimaryCursor.Cursor, 0, &TmpCert, "Cert");
-        if (RT_SUCCESS(rc))
+        if (pSectionHead)
         {
-            rc = RTCrX509Certificate_CheckSanity(&TmpCert, 0, pErrInfo, "Cert");
+            RTCRX509CERTIFICATE TmpCert;
+            RTASN1CURSORPRIMARY PrimaryCursor;
+            RTAsn1CursorInitPrimary(&PrimaryCursor, pSectionHead->pbData, (uint32_t)RT_MIN(pSectionHead->cbData, UINT32_MAX),
+                                    pErrInfo, pAllocator, RTASN1CURSOR_FLAGS_DER, RTPathFilename(pszFilename));
+            rc = RTCrX509Certificate_DecodeAsn1(&PrimaryCursor.Cursor, 0, &TmpCert, "Cert");
             if (RT_SUCCESS(rc))
             {
-                rc = RTCrX509Certificate_Clone(pCertificate, &TmpCert, pAllocator);
+                rc = RTCrX509Certificate_CheckSanity(&TmpCert, 0, pErrInfo, "Cert");
                 if (RT_SUCCESS(rc))
                 {
-                    if (pSectionHead->pNext || PrimaryCursor.Cursor.cbLeft)
-                        rc = VINF_ASN1_MORE_DATA;
+                    rc = RTCrX509Certificate_Clone(pCertificate, &TmpCert, pAllocator);
+                    if (RT_SUCCESS(rc))
+                    {
+                        if (pSectionHead->pNext || PrimaryCursor.Cursor.cbLeft)
+                            rc = VINF_ASN1_MORE_DATA;
+                    }
                 }
+                RTCrX509Certificate_Delete(&TmpCert);
             }
-            RTCrX509Certificate_Delete(&TmpCert);
+            RTCrPemFreeSections(pSectionHead);
         }
-        RTCrPemFreeSections(pSectionHead);
+        else
+            rc = rc != VINF_SUCCESS ? -rc : VERR_INTERNAL_ERROR_2;
+
     }
     return rc;
@@ -89 +97 @@
                                                PRTERRINFO pErrInfo, const char *pszErrorTag)
 {
-    AssertReturn(!fFlags, VERR_INVALID_FLAGS);
+    AssertReturn(!(fFlags & ~RTCRX509CERT_READ_F_PEM_ONLY), VERR_INVALID_FLAGS);
     PCRTCRPEMSECTION pSectionHead;
-    int rc = RTCrPemParseContent(pvBuf, cbBuf, 0, g_aRTCrX509CertificateMarkers, g_cRTCrX509CertificateMarkers,
+    int rc = RTCrPemParseContent(pvBuf, cbBuf,
+                                 fFlags & RTCRX509CERT_READ_F_PEM_ONLY ? RTCRPEMREADFILE_F_ONLY_PEM : 0,
+                                 g_aRTCrX509CertificateMarkers, g_cRTCrX509CertificateMarkers,
                                  &pSectionHead, pErrInfo);
     if (RT_SUCCESS(rc))
     {
-        RTCRX509CERTIFICATE TmpCert;
-        RTASN1CURSORPRIMARY PrimaryCursor;
-        RTAsn1CursorInitPrimary(&PrimaryCursor, pSectionHead->pbData, (uint32_t)RT_MIN(pSectionHead->cbData, UINT32_MAX),
-                                pErrInfo, pAllocator, RTASN1CURSOR_FLAGS_DER, pszErrorTag);
-        rc = RTCrX509Certificate_DecodeAsn1(&PrimaryCursor.Cursor, 0, &TmpCert, "Cert");
-        if (RT_SUCCESS(rc))
+        if (pSectionHead)
         {
-            rc = RTCrX509Certificate_CheckSanity(&TmpCert, 0, pErrInfo, "Cert");
+            RTCRX509CERTIFICATE TmpCert;
+            RTASN1CURSORPRIMARY PrimaryCursor;
+            RTAsn1CursorInitPrimary(&PrimaryCursor, pSectionHead->pbData, (uint32_t)RT_MIN(pSectionHead->cbData, UINT32_MAX),
+                                    pErrInfo, pAllocator, RTASN1CURSOR_FLAGS_DER, pszErrorTag);
+            rc = RTCrX509Certificate_DecodeAsn1(&PrimaryCursor.Cursor, 0, &TmpCert, "Cert");
             if (RT_SUCCESS(rc))
             {
-                rc = RTCrX509Certificate_Clone(pCertificate, &TmpCert, pAllocator);
+                rc = RTCrX509Certificate_CheckSanity(&TmpCert, 0, pErrInfo, "Cert");
                 if (RT_SUCCESS(rc))
                 {
-                    if (pSectionHead->pNext || PrimaryCursor.Cursor.cbLeft)
-                        rc = VINF_ASN1_MORE_DATA;
+                    rc = RTCrX509Certificate_Clone(pCertificate, &TmpCert, pAllocator);
+                    if (RT_SUCCESS(rc))
+                    {
+                        if (pSectionHead->pNext || PrimaryCursor.Cursor.cbLeft)
+                            rc = VINF_ASN1_MORE_DATA;
+                    }
                 }
+                RTCrX509Certificate_Delete(&TmpCert);
             }
-            RTCrX509Certificate_Delete(&TmpCert);
+            RTCrPemFreeSections(pSectionHead);
         }
-        RTCrPemFreeSections(pSectionHead);
+        else
+            rc = rc != VINF_SUCCESS ? -rc : VERR_INTERNAL_ERROR_2;
     }
     return rc;
@@ -125 +140 @@
                                               PRTCRX509CERTIFICATES pCertificates, PRTERRINFO pErrInfo)
 {
-    AssertReturn(!fFlags, VERR_INVALID_FLAGS);
+    AssertReturn(!(fFlags & ~RTCRX509CERT_READ_F_PEM_ONLY), VERR_INVALID_FLAGS);
     PCRTCRPEMSECTION pSectionHead;
-    int rc = RTCrPemReadFile(pszFilename, 0, g_aRTCrX509CertificateMarkers, g_cRTCrX509CertificateMarkers,
+    int rc = RTCrPemReadFile(pszFilename,
+                             fFlags & RTCRX509CERT_READ_F_PEM_ONLY ? RTCRPEMREADFILE_F_ONLY_PEM : 0,
+                             g_aRTCrX509CertificateMarkers, g_cRTCrX509CertificateMarkers,
                              &pSectionHead, pErrInfo);
     if (RT_SUCCESS(rc))