Changeset 73749 in vbox for trunk/include/iprt/crypto

Timestamp:

Aug 18, 2018 12:25:57 AM (7 years ago)

Author:

vboxsync

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

124432

Message:

IPRT/crypto: Implemented reading of PEM encrypted RSA keys. bugref:9152

Location:

trunk/include/iprt/crypto

Files:

• key.h (modified) (1 diff)
• pem.h (modified) (3 diffs)

trunk/include/iprt/crypto/key.h

@@ -66 +66 @@
                                                                 PRTERRINFO pErrInfo, const char *pszErrorTag);
 RTDECL(int)             RTCrKeyCreateFromPemSection(PRTCRKEY hKey, uint32_t fFlags, struct RTCRPEMSECTION const *pSection,
-                                                    PRTERRINFO pErrInfo, const char *pszErrorTag);
+                                                    const char *pszPassword, PRTERRINFO pErrInfo, const char *pszErrorTag);
 RTDECL(int)             RTCrKeyCreateFromBuffer(PRTCRKEY hKey, uint32_t fFlags, void const *pvSrc, size_t cbSrc,
-                                                PRTERRINFO pErrInfo, const char *pszErrorTag);
-RTDECL(int)             RTCrKeyCreateFromFile(PRTCRKEY hKey, uint32_t fFlags, const char *pszFilename, PRTERRINFO pErrInfo);
+                                                const char *pszPassword, PRTERRINFO pErrInfo, const char *pszErrorTag);
+RTDECL(int)             RTCrKeyCreateFromFile(PRTCRKEY hKey, uint32_t fFlags, const char *pszFilename,
+                                              const char *pszPassword, PRTERRINFO pErrInfo);
 /** @todo add support for decrypting private keys.  */
 /** @name RTCRKEYFROM_F_XXX

trunk/include/iprt/crypto/pem.h

@@ -69 +69 @@
 /** Pointer to a const PEM marker. */
 typedef RTCRPEMMARKER const *PCRTCRPEMMARKER;
+
+
+/**
+ * A PEM field.
+ */
+typedef struct RTCRPEMFIELD
+{
+    /** Pointer to the next field. */
+    struct RTCRPEMFIELD const *pNext;
+    /** The field value. */
+    char const         *pszValue;
+    /** The field value length. */
+    size_t              cchValue;
+    /** The field name length. */
+    size_t              cchName;
+    /** The field name. */
+    char                szName[RT_FLEXIBLE_ARRAY];
+} RTCRPEMFIELD;
+/** Pointer to a PEM field. */
+typedef RTCRPEMFIELD *PRTCRPEMFIELD;
+/** Pointer to a const PEM field. */
+typedef RTCRPEMFIELD const *PCRTCRPEMFIELD;
 
 
@@ -86 +108 @@
     /** The size of the binary data. */
     size_t              cbData;
-    /** Additional text preceeding the binary data.  NULL if none. */
-    char               *pszPreamble;
-    /** The length of the preamble. */
-    size_t              cchPreamble;
+    /** List of fields, NULL if none. */
+    PCRTCRPEMFIELD      pFieldHead;
+    /** Set if RTCRPEMREADFILE_F_SENSITIVE was specified. */
+    bool                fSensitive;
 } RTCRPEMSECTION;
 /** Pointer to a PEM section. */
@@ -158 +180 @@
 /** Only PEM sections, no binary fallback. */
 #define RTCRPEMREADFILE_F_ONLY_PEM                      RT_BIT(1)
+/** Sensitive data, use the safer allocator. */
+#define RTCRPEMREADFILE_F_SENSITIVE                     RT_BIT(2)
 /** Valid flags. */
-#define RTCRPEMREADFILE_F_VALID_MASK                    UINT32_C(0x00000003)
+#define RTCRPEMREADFILE_F_VALID_MASK                    UINT32_C(0x00000007)
 /** @} */