Changeset 100528 in vbox for trunk/include

Timestamp:

Jul 11, 2023 10:52:34 PM (20 months ago)

Author:

vboxsync

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

158333

Message:

IPRT/PKCS8: Added the ability to load PKCS\#8 EncryptedPrivateKey format. bugref:10299

Location:

trunk/include/iprt

Files:

• crypto/pkcs8.h (modified) (3 diffs)
• err.h (modified) (1 diff)
• mangling.h (modified) (2 diffs)

trunk/include/iprt/crypto/pkcs8.h

@@ -81 +81 @@
 RTASN1TYPE_STANDARD_PROTOTYPES(RTCRPKCS8PRIVATEKEYINFO, RTDECL, RTCrPkcs8PrivateKeyInfo, SeqCore.Asn1Core);
 
-#if 0
-
 /**
  * PKCS\#8 EncryptedPrivateKeyInfo.
@@ -88 +86 @@
  * See RFC-5208 section 6.
  */
-typedef struct RTCRENCRYPTEDPRIVATEKEY
+typedef struct RTCRPKCS8ENCRYPTEDPRIVATEKEYINFO
 {
     /** Sequence core for the structure. */
@@ -96 +94 @@
     /** The encrypted data. */
     RTASN1OCTETSTRING           EncryptedData;
-} RTCRENCRYPTEDPRIVATEKEY;
-/** Pointer to the ASN.1 IPRT representation of a PKCS8 encrypted private key. */
-typedef RTCRENCRYPTEDPRIVATEKEY *PRTCRENCRYPTEDPRIVATEKEY;
-/** Pointer to the const ASN.1 IPRT representation of a PKCS8 encrypted private key. */
-typedef RTCRENCRYPTEDPRIVATEKEY const *PCRTCRENCRYPTEDPRIVATEKEY;
-RTASN1TYPE_STANDARD_PROTOTYPES(RTCRENCRYPTEDPRIVATEKEY, RTDECL, RTCrEncryptedPrivateKey, SeqCore.Asn1Core);
-
-#endif
+} RTCRPKCS8ENCRYPTEDPRIVATEKEYINFO;
+/** Pointer to the ASN.1 IPRT representation of a PKCS8 encrypted private
+ * key info. */
+typedef RTCRPKCS8ENCRYPTEDPRIVATEKEYINFO *PRTCRPKCS8ENCRYPTEDPRIVATEKEYINFO;
+/** Pointer to the const ASN.1 IPRT representation of a PKCS8 encrypted
+ * private key info. */
+typedef RTCRPKCS8ENCRYPTEDPRIVATEKEYINFO const *PCRTCRPKCS8ENCRYPTEDPRIVATEKEYINFO;
+RTASN1TYPE_STANDARD_PROTOTYPES(RTCRPKCS8ENCRYPTEDPRIVATEKEYINFO, RTDECL, RTCrPkcs8EncryptedPrivateKeyInfo, SeqCore.Asn1Core);
 
 /** @} */

trunk/include/iprt/err.h

@@ -2156 +2156 @@
 /** The EVP_PKEY_type API in OpenSSL failed.  */
 #define VERR_CR_PKIX_OSSL_EVP_PKEY_TYPE_ERROR       (-23517)
-/** OpenSSL failed to decode the public key. */
+/** OpenSSL failed to decode the private key. */
 #define VERR_CR_PKIX_OSSL_D2I_PRIVATE_KEY_FAILED    (-23518)
 /** The EVP_PKEY_CTX_set_rsa_padding API in OpenSSL failed.  */

trunk/include/iprt/mangling.h

@@ -3699 +3699 @@
 # define RTCrPkcs8PrivateKeyInfo_Enum                   RT_MANGLER(RTCrPkcs8PrivateKeyInfo_Enum)
 # define RTCrPkcs8PrivateKeyInfo_Init                   RT_MANGLER(RTCrPkcs8PrivateKeyInfo_Init)
+# define RTCrPkcs8EncryptedPrivateKeyInfo_CheckSanity   RT_MANGLER(RTCrPkcs8EncryptedPrivateKeyInfo_CheckSanity)
+# define RTCrPkcs8EncryptedPrivateKeyInfo_Clone         RT_MANGLER(RTCrPkcs8EncryptedPrivateKeyInfo_Clone)
+# define RTCrPkcs8EncryptedPrivateKeyInfo_Compare       RT_MANGLER(RTCrPkcs8EncryptedPrivateKeyInfo_Compare)
+# define RTCrPkcs8EncryptedPrivateKeyInfo_DecodeAsn1    RT_MANGLER(RTCrPkcs8EncryptedPrivateKeyInfo_DecodeAsn1)
+# define RTCrPkcs8EncryptedPrivateKeyInfo_Delete        RT_MANGLER(RTCrPkcs8EncryptedPrivateKeyInfo_Delete)
+# define RTCrPkcs8EncryptedPrivateKeyInfo_Enum          RT_MANGLER(RTCrPkcs8EncryptedPrivateKeyInfo_Enum)
+# define RTCrPkcs8EncryptedPrivateKeyInfo_Init          RT_MANGLER(RTCrPkcs8EncryptedPrivateKeyInfo_Init)
 # define RTCrPkixSignatureCreateByObjId                 RT_MANGLER(RTCrPkixSignatureCreateByObjId)
 # define RTCrPkixSignatureCreateByObjIdString           RT_MANGLER(RTCrPkixSignatureCreateByObjIdString)
@@ -4322 +4329 @@
 # define g_cRTCrPkcs7Markers                            RT_MANGLER(g_cRTCrPkcs7Markers)
 # define g_RTCrPkcs8PrivateKeyInfo_Vtable               RT_MANGLER(g_RTCrPkcs8PrivateKeyInfo_Vtable)
+# define g_RTCrPkcs8EncryptedPrivateKeyInfo_Vtable      RT_MANGLER(g_RTCrPkcs8EncryptedPrivateKeyInfo_Vtable)
 # define g_aRTCrX509CertificateMarkers                  RT_MANGLER(g_aRTCrX509CertificateMarkers)
 # define g_cRTCrX509CertificateMarkers                  RT_MANGLER(g_cRTCrX509CertificateMarkers)