Security-58286.260.20.tar.gz

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

diff --git a/OSX/libsecurity_smime/lib/SecCmsBase.h b/OSX/libsecurity_smime/lib/SecCmsBase.h
index c3c036909119016bd627ca1a4dcc088c0943310c..8bc62d4c0bb7624d9ddc282afe7622f086d50c75 100644 (file)
--- a/OSX/libsecurity_smime/lib/SecCmsBase.h
+++ b/OSX/libsecurity_smime/lib/SecCmsBase.h
@@ -53,7 +53,7 @@ typedef struct SECOidDataStr SECOidData;
     @typedef
     @discussion XXX We might want to get rid of this alltogether.
  */
-typedef CSSM_X509_ALGORITHM_IDENTIFIER SECAlgorithmID;
+typedef CSSM_X509_ALGORITHM_IDENTIFIER SECAlgorithmID DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;
 
 /*!
     @typedef
@@ -155,7 +155,7 @@ typedef void (*SecCmsContentCallback)(void *arg, const char *buf, size_t len);
     @typedef
     @discussion Type of function passed to SecCmsDecode or SecCmsDecoderStart to retrieve the decryption key.  This function is intended to be used for EncryptedData content info's which do not have a key available in a certificate, etc.
  */
-typedef SecSymmetricKeyRef(*SecCmsGetDecryptKeyCallback)(void *arg, SECAlgorithmID *algid);
+typedef SecSymmetricKeyRef(*SecCmsGetDecryptKeyCallback)(void *arg, SECAlgorithmID *algid) DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;
 
 /*!
     @enum SecCmsVerificationStatus
@@ -428,7 +428,7 @@ typedef enum {
     /* New PSM certificate management OIDs */
     SEC_OID_CERT_RENEWAL_LOCATOR = 177,
     SEC_OID_NS_CERT_EXT_SCOPE_OF_USE = 178,
-    
+
     /* CMS (RFC2630) OIDs */
     SEC_OID_CMS_EPHEMERAL_STATIC_DIFFIE_HELLMAN = 179,
     SEC_OID_CMS_3DES_KEY_WRAP = 180,
@@ -449,34 +449,47 @@ typedef enum {
 
     SEC_OID_MS_SMIME_ENCRYPTION_KEY_PREFERENCE = 190,
 
-    SEC_OID_SHA256              = 191,
-    SEC_OID_SHA384              = 192,
-    SEC_OID_SHA512              = 193,
+    SEC_OID_SHA224              = 191,
+    SEC_OID_SHA256              = 192,
+    SEC_OID_SHA384              = 193,
+    SEC_OID_SHA512              = 194,
 
-    SEC_OID_PKCS1_SHA256_WITH_RSA_ENCRYPTION = 194,
-    SEC_OID_PKCS1_SHA384_WITH_RSA_ENCRYPTION = 195,
-    SEC_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION = 196,
+    SEC_OID_PKCS1_SHA256_WITH_RSA_ENCRYPTION = 195,
+    SEC_OID_PKCS1_SHA384_WITH_RSA_ENCRYPTION = 196,
+    SEC_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION = 197,
 
-    SEC_OID_AES_128_KEY_WRAP   = 197,
-    SEC_OID_AES_192_KEY_WRAP   = 198,
-    SEC_OID_AES_256_KEY_WRAP   = 199,
+    SEC_OID_AES_128_KEY_WRAP   = 198,
+    SEC_OID_AES_192_KEY_WRAP   = 199,
+    SEC_OID_AES_256_KEY_WRAP   = 200,
 
     /* eContentType set by client and not understood by this library; treated 
      * like SEC_OID_PKCS7_DATA, except the caller's OID is encoded. */
-    SEC_OID_OTHER              = 200,
-    
+    SEC_OID_OTHER              = 201,
+
        /* ECDSA */
-       SEC_OID_EC_PUBLIC_KEY  = 201,
-       SEC_OID_ECDSA_WithSHA1 = 202,
-       SEC_OID_DH_SINGLE_STD_SHA1KDF = 203,
-       SEC_OID_SECP_256_R1 = 204,
-       SEC_OID_SECP_384_R1 = 205,
-       SEC_OID_SECP_521_R1 = 206,
-       
+       SEC_OID_EC_PUBLIC_KEY  = 202,
+       SEC_OID_ECDSA_WithSHA1 = 203,
+       SEC_OID_DH_SINGLE_STD_SHA1KDF = 204,
+       SEC_OID_SECP_256_R1 = 205,
+       SEC_OID_SECP_384_R1 = 206,
+       SEC_OID_SECP_521_R1 = 207,
+
     /* RFC 3161 Timestamping OIDs */
-    SEC_OID_PKCS9_ID_CT_TSTInfo = 207,
-    SEC_OID_PKCS9_TIMESTAMP_TOKEN = 208,
-    SEC_OID_PKCS9_SIGNING_CERTIFICATE = 209,
+    SEC_OID_PKCS9_ID_CT_TSTInfo = 208,
+    SEC_OID_PKCS9_TIMESTAMP_TOKEN = 209,
+    SEC_OID_PKCS9_SIGNING_CERTIFICATE = 210,
+
+    /* ECDSA with SHA2 */
+    SEC_OID_ECDSA_WITH_SHA256 = 211,
+    SEC_OID_ECDSA_WITH_SHA384 = 212,
+    SEC_OID_ECDSA_WITH_SHA512 = 213,
+
+    /* Apple CMS Attributes */
+    SEC_OID_APPLE_HASH_AGILITY = 214,
+    SEC_OID_APPLE_HASH_AGILITY_V2 = 215,
+
+    /* Apple Expiration Time Attribute */
+    SEC_OID_APPLE_EXPIRATION_TIME = 216,
 
     SEC_OID_TOTAL
 } SECOidTag;
@@ -497,7 +510,7 @@ OSStatus SecArenaPoolCreate(size_t chunksize, SecArenaPoolRef *outArena);
     @abstract Free a SecArenaPool object and everything in it.
     @param arena The SecArenaPool object to free.
     @param zero If this is true the arena's memory will be zero filled before it is freed.
-    @result arena will no longer be valid and the memory used by it is returned to the malloc heap.
+    @discussion arena will no longer be valid and the memory used by it is returned to the malloc heap.
     @availability 10.4 and later
     @updated 2004-04-23
  */