Changeset 59625 in vbox

Timestamp:

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

Author:

vboxsync

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

105464

Message:

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

Location:

trunk

Files:

• include/iprt/crypto/pem.h (modified) (3 diffs)
• include/iprt/crypto/x509.h (modified) (2 diffs)
• include/iprt/mangling.h (modified) (2 diffs)
• src/VBox/Runtime/common/crypto/pemfile.cpp (modified) (3 diffs)
• src/VBox/Runtime/common/crypto/x509-file.cpp (modified) (4 diffs)

trunk/include/iprt/crypto/pem.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2015 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -24 +24 @@
  */
 
-#ifndef ___iprt_crypto_spc_h
-#define ___iprt_crypto_spc_h
+#ifndef ___iprt_crypto_pem_h
+#define ___iprt_crypto_pem_h
 
-#include <iprt/asn1.h>
-#include <iprt/crypto/x509.h>
-#include <iprt/crypto/pkcs7.h>
-#include <iprt/md5.h>
-#include <iprt/sha.h>
+#include <iprt/types.h>
 
 
@@ -156 +152 @@
 /** @} */
 
+/**
+ * Finds the beginning of first PEM section using the specified markers.
+ *
+ * This will not look any further than the first section.  Nor will it check for
+ * binaries.
+ *
+ * @returns Pointer to the "-----BEGIN XXXX" sequence on success.
+ *          NULL if not found.
+ * @param   pvContent       The content bytes to parse.
+ * @param   cbContent       The number of content bytes.
+ * @param   paMarkers       Array of one or more section markers to look for.
+ * @param   cMarkers        Number of markers in the array.
+ */
+RTDECL(const char *) RTCrPemFindFirstSectionInContent(void const *pvContent, size_t cbContent,
+                                                      PCRTCRPEMMARKER paMarkers, size_t cMarkers);
+
 /** @} */
 

trunk/include/iprt/crypto/x509.h

@@ -28 +28 @@
 
 #include <iprt/asn1.h>
+#include <iprt/crypto/pem.h>
 
 
@@ -965 +966 @@
                                                PRTERRINFO pErrInfo, const char *pszErrorTag);
 
+/** X509 Certificate markers for RTCrPemFindFirstSectionInContent et al. */
+extern RTDATADECL(RTCRPEMMARKER const)  g_aRTCrX509CertificateMarkers[];
+/** Number of entries in g_aRTCrX509CertificateMarkers. */
+extern RTDATADECL(uint32_t const)       g_cRTCrX509CertificateMarkers;
+
 
 

trunk/include/iprt/mangling.h

@@ -2743 +2743 @@
 # define RTCrRsaPrivateKey_CheckSanity                  RT_MANGLER(RTCrRsaPrivateKey_CheckSanity)
 # define RTCrRsaPublicKey_CheckSanity                   RT_MANGLER(RTCrRsaPublicKey_CheckSanity)
+# define RTCrPemFindFirstSectionInContent               RT_MANGLER(RTCrPemFindFirstSectionInContent)
 # define RTCrPemFreeSections                            RT_MANGLER(RTCrPemFreeSections)
 # define RTCrPemParseContent                            RT_MANGLER(RTCrPemParseContent)
@@ -3314 +3315 @@
 # define g_RTAsn1DefaultAllocator                       RT_MANGLER(g_RTAsn1DefaultAllocator)
 # define g_RTAsn1EFenceAllocator                        RT_MANGLER(g_RTAsn1EFenceAllocator)
+# define g_aRTCrX509CertificateMarkers                  RT_MANGLER(g_aRTCrX509CertificateMarkers)
+# define g_cRTCrX509CertificateMarkers                  RT_MANGLER(g_cRTCrX509CertificateMarkers)
+
 #if 0 /* Disabled for now as I'm not sure the assmbler supports mangling yet. */
 # define g_abRTZeroPage                                 RT_MANGLER(g_abRTZeroPage)

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