Changeset 59625 in vbox for trunk/src/VBox/Runtime/common/crypto/x509-file.cpp

Timestamp:

Feb 10, 2016 8:55:22 AM (9 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Runtime/common/crypto/x509-file.cpp (modified) (4 diffs)

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))
     {