Changeset 52503 in vbox

Timestamp:

Aug 26, 2014 2:43:04 PM (10 years ago)

Author:

vboxsync

Message:

Started working on PKCS #7 attributes.

Location:

trunk

Files:

• include/iprt/crypto/pkcs7.h (modified) (4 diffs)
• src/VBox/Runtime/common/crypto/pkcs7-template.h (modified) (1 diff)

trunk/include/iprt/crypto/pkcs7.h

@@ -59 +59 @@
 
 
+/** Pointer to the IPRT representation of a PKCS \#7 SignerInfo. */
+typedef struct RTCRPKCS7SIGNERINFO *PRTCRPKCS7SIGNERINFO;
+/** Pointer to the const IPRT representation of a PKCS \#7 SignerInfo. */
+typedef struct RTCRPKCS7SIGNERINFO const *PCRTCRPKCS7SIGNERINFO;
+RTASN1_IMPL_GEN_SET_OF_TYPEDEFS_AND_PROTOS(RTCRPKCS7SIGNERINFOS, RTCRPKCS7SIGNERINFO, RTDECL, RTCrPkcs7SignerInfos);
+
+
 /**
  * Attribute value type (for the union).
@@ -68 +75 @@
     /** Not present, union is NULL. */
     RTCRPKCS7ATTRIBUTETYPE_NOT_PRESENT,
-    /** Unknown values, Asn1Core. */
+    /** Unknown values, pCores. */
     RTCRPKCS7ATTRIBUTETYPE_UNKNOWN,
-    /** Object IDs, use ObjId. */
+    /** Object IDs, use pObjIds. */
     RTCRPKCS7ATTRIBUTETYPE_OBJ_IDS,
-    /** Octet strings. */
+    /** Octet strings, use pOctetStrings. */
     RTCRPKCS7ATTRIBUTETYPE_OCTET_STRINGS,
+    /** Counter signatures (PKCS \#9), use pCounterSignatures. */
+    RTCRPKCS7ATTRIBUTETYPE_COUNTER_SIGNATURES,
+    /** Signing time (PKCS \#9), use pSigningTime. */
+    RTCRPKCS7ATTRIBUTETYPE_SIGNING_TIME,
     /** Blow the type up to 32-bits. */
     RTCRPKCS7ATTRIBUTETYPE_32BIT_HACK = 0x7fffffff
@@ -100 +111 @@
         /** ASN.1 octet strings (RTCRPKCS7ATTRIBUTETYPE_OCTET_STRINGS). */
         PRTASN1SETOFOCTETSTRINGS        pOctetStrings;
+        /** Counter signatures RTCRPKCS7ATTRIBUTETYPE_COUNTER_SIGNATURES(). */
+        PRTCRPKCS7SIGNERINFOS           pCounterSignatures;
+        /** Signing time(s) (RTCRPKCS7ATTRIBUTETYPE_SIGNING_TIME). */
+        PRTASN1SETOFTIMES               pSigningTime;
     } uValues;
 } RTCRPKCS7ATTRIBUTE;
@@ -139 +154 @@
     RTCRPKCS7ATTRIBUTES                 UnauthenticatedAttributes;
 } RTCRPKCS7SIGNERINFO;
-/** Pointer to the IPRT representation of a PKCS \#7 SignerInfo. */
-typedef RTCRPKCS7SIGNERINFO *PRTCRPKCS7SIGNERINFO;
-/** Pointer to the const IPRT representation of a PKCS \#7 SignerInfo. */
-typedef RTCRPKCS7SIGNERINFO const *PCRTCRPKCS7SIGNERINFO;
 RTASN1TYPE_STANDARD_PROTOTYPES(RTCRPKCS7SIGNERINFO, RTDECL, RTCrPkcs7SignerInfo, SeqCore.Asn1Core);
-RTASN1_IMPL_GEN_SET_OF_TYPEDEFS_AND_PROTOS(RTCRPKCS7SIGNERINFOS, RTCRPKCS7SIGNERINFO, RTDECL, RTCrPkcs7SignerInfos);
 
 /** RTCRPKCS7SIGNERINFO::Version value.  */

trunk/src/VBox/Runtime/common/crypto/pkcs7-template.h

@@ -55 +55 @@
 RTASN1TMPL_MEMBER_DYN(          uValues,    pObjIds,        RTASN1SETOFOBJIDS,          RTAsn1SetOfObjIds,          Allocation,
     enmType, RTCRPKCS7ATTRIBUTETYPE_OBJ_IDS,        RTAsn1ObjId_CompareWithString(&pThis->Type, RTCR_PKCS9_ID_CONTENT_TYPE_OID) == 0);
+RTASN1TMPL_MEMBER_DYN(          uValues, pCounterSignatures, RTCRPKCS7SINGERINFOS,      RTCrPkcs7SignerInfos,       Allocation,
+    enmType, RTCRPKCS7ATTRIBUTETYPE_COUNTER_SIGNATURES, RTAsn1ObjId_CompareWithString(&pThis->Type, RTCR_PKCS9_ID_COUNTER_SIGNATURE_OID) == 0);
+RTASN1TMPL_MEMBER_DYN(          uValues,    pSigningTime,   RTASN1SETOFTIMES,           RTAsn1SetOfTimes,           Allocation,
+    enmType, RTCRPKCS7ATTRIBUTETYPE_SIGNING_TIME,   RTAsn1ObjId_CompareWithString(&pThis->Type, RTCR_PKCS9_ID_SIGNING_TIME_OID) == 0);
 RTASN1TMPL_MEMBER_DYN_DEFAULT(  uValues,    pCores,         RTASN1SETOFCORES,           RTAsn1SetOfCores,           Allocation,
     enmType, RTCRPKCS7ATTRIBUTETYPE_UNKNOWN);