Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_smime / lib / cmstpriv.h

diff --git a/OSX/libsecurity_smime/lib/cmstpriv.h b/OSX/libsecurity_smime/lib/cmstpriv.h
index 012ff4962baee39690cd688c14af16d5e2cac12f..4c78e6e44ee8462e433f356c5a1b63cd32c685f1 100644 (file)
--- a/OSX/libsecurity_smime/lib/cmstpriv.h
+++ b/OSX/libsecurity_smime/lib/cmstpriv.h
@@ -226,7 +226,10 @@ struct SecCmsSignerInfoStr {
     CFAbsoluteTime             tsaLeafNotBefore;   /* Start date for Timestamp Authority leaf */
     CFAbsoluteTime             tsaLeafNotAfter;    /* Expiration date for Timestamp Authority leaf */
     CFMutableArrayRef  timestampCertList;
+    SecCertificateRef   timestampCert;
     CFDataRef           hashAgilityAttrValue;
+    CFDictionaryRef     hashAgilityV2AttrValues;
+    CFAbsoluteTime      expirationTime;
 };
 #define SEC_CMS_SIGNER_INFO_VERSION_ISSUERSN   1       /* what we *create* */
 #define SEC_CMS_SIGNER_INFO_VERSION_SUBJKEY    3       /* what we *create* */
@@ -319,9 +322,9 @@ struct SecCmsOriginatorIdentifierOrKeyStr {
 typedef struct SecCmsOriginatorIdentifierOrKeyStr SecCmsOriginatorIdentifierOrKey;
 
 struct SecCmsRecipientKeyIdentifierStr {
-    CSSM_DATA_PTR                              subjectKeyIdentifier;
-    CSSM_DATA_PTR                              date;                   /* optional */
-    CSSM_DATA_PTR                              other;                  /* optional */
+    CSSM_DATA                          subjectKeyIdentifier;
+    CSSM_DATA                          date;                   /* optional */
+    CSSM_DATA                          other;                  /* optional */
 };
 typedef struct SecCmsRecipientKeyIdentifierStr SecCmsRecipientKeyIdentifier;