Changeset 64865 in vbox for trunk

Timestamp:

Dec 14, 2016 1:39:09 PM (8 years ago)

Author:

vboxsync

Message:

IPRT/PKCS#7: Decode MS statement type attributes.

Location:

trunk

Files:

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

trunk/include/iprt/crypto/pkcs7.h

@@ -89 +89 @@
     /** Microsoft nested PKCS\#7 signature (signtool /as). */
     RTCRPKCS7ATTRIBUTETYPE_MS_NESTED_SIGNATURE,
+    /** Microsoft statement type, use pObjIdSeqs. */
+    RTCRPKCS7ATTRIBUTETYPE_MS_STATEMENT_TYPE,
     /** Blow the type up to 32-bits. */
     RTCRPKCS7ATTRIBUTETYPE_32BIT_HACK = 0x7fffffff
@@ -113 +115 @@
         /** ASN.1 object identifiers (RTCRPKCS7ATTRIBUTETYPE_OBJ_IDS). */
         PRTASN1SETOFOBJIDS              pObjIds;
+        /** Sequence of ASN.1 object identifiers (RTCRPKCS7ATTRIBUTETYPE_MS_STATEMENT_TYPE). */
+        PRTASN1SETOFOBJIDSEQS           pObjIdSeqs;
         /** ASN.1 octet strings (RTCRPKCS7ATTRIBUTETYPE_OCTET_STRINGS). */
         PRTASN1SETOFOCTETSTRINGS        pOctetStrings;

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

@@ -63 +63 @@
 RTASN1TMPL_MEMBER_DYN(          uValues,    pContentInfos,  RTCRPKCS7SETOFCONTENTINFOS, RTCrPkcs7SetOfContentInfos, Allocation,
     enmType, RTCRPKCS7ATTRIBUTETYPE_MS_NESTED_SIGNATURE, RTAsn1ObjId_CompareWithString(&pThis->Type, RTCR_PKCS9_ID_MS_NESTED_SIGNATURE) == 0);
+RTASN1TMPL_MEMBER_DYN(          uValues,    pObjIdSeqs,     RTASN1SETOFOBJIDSEQS,       RTAsn1SetOfObjIdSeqs,       Allocation,
+    enmType, RTCRPKCS7ATTRIBUTETYPE_MS_STATEMENT_TYPE, RTAsn1ObjId_CompareWithString(&pThis->Type, RTCR_PKCS9_ID_MS_STATEMENT_TYPE) == 0);
 RTASN1TMPL_MEMBER_DYN_DEFAULT(  uValues,    pCores,         RTASN1SETOFCORES,           RTAsn1SetOfCores,           Allocation,
     enmType, RTCRPKCS7ATTRIBUTETYPE_UNKNOWN);