Changeset 64819 in vbox for trunk/include/iprt

Timestamp:

Dec 8, 2016 9:45:12 PM (8 years ago)

Author:

vboxsync

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

112203

Message:

iprt/pkcs7: updates

File:

• trunk/include/iprt/crypto/pkcs7.h (modified) (3 diffs)

trunk/include/iprt/crypto/pkcs7.h

@@ -87 +87 @@
     /** Microsoft timestamp info (RFC-3161) signed data, use pContentInfo. */
     RTCRPKCS7ATTRIBUTETYPE_MS_TIMESTAMP,
+    /** Microsoft nested PKCS\#7 signature (signtool /as). */
+    RTCRPKCS7ATTRIBUTETYPE_MS_NESTED_SIGNATURE,
     /** Blow the type up to 32-bits. */
     RTCRPKCS7ATTRIBUTETYPE_32BIT_HACK = 0x7fffffff
@@ -117 +119 @@
         /** Signing time(s) (RTCRPKCS7ATTRIBUTETYPE_SIGNING_TIME). */
         PRTASN1SETOFTIMES               pSigningTime;
-        /** Microsoft timestamp (RFC-3161 signed data). */
+        /** Microsoft timestamp (RFC-3161 signed data, RTCRPKCS7ATTRIBUTETYPE_MS_TIMESTAMP),
+         * Microsoft nested signature (RTCRPKCS7ATTRIBUTETYPE_MS_NESTED_SIGNATURE). */
         struct RTCRPKCS7SETOFCONTENTINFOS *pContentInfos;
     } uValues;
@@ -178 +181 @@
 #define RTCR_PKCS9_ID_COUNTER_SIGNATURE_OID "1.2.840.113549.1.9.6"
 /** Microsoft timestamp (RTF-3161) counter signature (SignedData).
- * @remarks This isn't defined by PKCS \#9, but lumped in here for
- *          convenience.  It's actually listed as SPC by MS. */
+ * @remarks This isn't defined by PKCS \#9, but lumped in here for convenience. It's actually listed as SPC by MS. */
 #define RTCR_PKCS9_ID_MS_TIMESTAMP          "1.3.6.1.4.1.311.3.3.1"
+/** Microsoft nested PKCS\#7 signature.
+ * @remarks This isn't defined by PKCS \#9, but lumped in here for convenience. */
+#define RTCR_PKCS9_ID_MS_NESTED_SIGNATURE   "1.3.6.1.4.1.311.2.4.1"
+/** Microsoft statement type.
+ * @remarks This isn't defined by PKCS \#9, but lumped in here for convenience. It's actually listed as SPC by MS. */
+#define RTCR_PKCS9_ID_MS_STATEMENT_TYPE     "1.3.6.1.4.1.311.2.1.11"
+/** Microsoft opus info.
+ * @remarks This isn't defined by PKCS \#9, but lumped in here for convenience. It's actually listed as SPC by MS. */
+#define RTCR_PKCS9_ID_MS_SP_OPUS_INFO       "1.3.6.1.4.1.311.2.1.12"
 /** @} */