vbox的更動 59625 路徑 trunk/src/VBox/Runtime

時間撮記:

2016-2-10 上午08:55:22 (9 年 以前)

作者:

vboxsync

訊息:

IPRT: Added RTCrPemFindFirstSectionInContent and exposed certificate PEM markers (g_aRTCrX509CertificateMarkers).

位置:

trunk/src/VBox/Runtime/common/crypto

檔案:

• pemfile.cpp (修改) (3 筆差異)
• x509-file.cpp (修改) (4 筆差異)

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

@@ -271 +271 @@
      *      tab, newline, return, form feed
      *
-     * However, if we wan't to read PEM files which contains human readable
+     * However, if we want to read PEM files which contains human readable
      * certificate details before or after each base-64 section, we can't stick
      * to 7-bit ASCII.  We could say it must be UTF-8, but that's probably to
-     * limited too.  So, we'll settle for detecting binary files by control
+     * limited as well.  So, we'll settle for detecting binary files by control
      * characters alone (safe enough for DER encoded stuff, I think).
      */
@@ -435 +435 @@
 
 
-
 RTDECL(int) RTCrPemReadFile(const char *pszFilename, uint32_t fFlags, PCRTCRPEMMARKER paMarkers, size_t cMarkers,
                             PCRTCRPEMSECTION *ppSectionHead, PRTERRINFO pErrInfo)
@@ -455 +454 @@
 }
 
+
+RTDECL(const char *) RTCrPemFindFirstSectionInContent(void const *pvContent, size_t cbContent,
+                                                      PCRTCRPEMMARKER paMarkers, size_t cMarkers)
+{
+    size_t offBegin;
+    if (rtCrPemFindMarker((uint8_t *)pvContent, cbContent, 0, "BEGIN", 5, paMarkers, cMarkers, NULL, &offBegin, NULL))
+        return (const char *)pvContent + offBegin;
+    return NULL;
+}

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

@@ -43 +43 @@
 static RTCRPEMMARKERWORD const g_aWords_Certificate[]  = { { RT_STR_TUPLE("CERTIFICATE") } };
 /** X509 Certificate markers. */
-static RTCRPEMMARKER     const g_aCertificateMarkers[] = { { g_aWords_Certificate, RT_ELEMENTS(g_aWords_Certificate) } };
+RT_DECL_DATA_CONST(RTCRPEMMARKER const) g_aRTCrX509CertificateMarkers[] =
+{
+    { g_aWords_Certificate, RT_ELEMENTS(g_aWords_Certificate) }
+};
+/** Number of entries in g_aRTCrX509CertificateMarkers. */
+RT_DECL_DATA_CONST(uint32_t const) g_cRTCrX509CertificateMarkers = RT_ELEMENTS(g_aRTCrX509CertificateMarkers);
 
 
@@ -51 +56 @@
     AssertReturn(!fFlags, VERR_INVALID_FLAGS);
     PCRTCRPEMSECTION pSectionHead;
-    int rc = RTCrPemReadFile(pszFilename, 0, g_aCertificateMarkers, RT_ELEMENTS(g_aCertificateMarkers), &pSectionHead, pErrInfo);
+    int rc = RTCrPemReadFile(pszFilename, 0, g_aRTCrX509CertificateMarkers, g_cRTCrX509CertificateMarkers,
+                             &pSectionHead, pErrInfo);
     if (RT_SUCCESS(rc))
     {
@@ -85 +91 @@
     AssertReturn(!fFlags, VERR_INVALID_FLAGS);
     PCRTCRPEMSECTION pSectionHead;
-    int rc = RTCrPemParseContent(pvBuf, cbBuf, 0, g_aCertificateMarkers, RT_ELEMENTS(g_aCertificateMarkers),
+    int rc = RTCrPemParseContent(pvBuf, cbBuf, 0, g_aRTCrX509CertificateMarkers, g_cRTCrX509CertificateMarkers,
                                  &pSectionHead, pErrInfo);
     if (RT_SUCCESS(rc))
@@ -121 +127 @@
     AssertReturn(!fFlags, VERR_INVALID_FLAGS);
     PCRTCRPEMSECTION pSectionHead;
-    int rc = RTCrPemReadFile(pszFilename, 0, g_aCertificateMarkers, RT_ELEMENTS(g_aCertificateMarkers), &pSectionHead, pErrInfo);
+    int rc = RTCrPemReadFile(pszFilename, 0, g_aRTCrX509CertificateMarkers, g_cRTCrX509CertificateMarkers,
+                             &pSectionHead, pErrInfo);
     if (RT_SUCCESS(rc))
     {