X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/d8f41ccd20de16f8ebe2ccc84d47bf1cb2b26bbb..3f0f0d49a9b6c2c6d459239f5926d59314cdeacf:/libsecurity_smime/lib/SecCmsBase.h

diff --git a/libsecurity_smime/lib/SecCmsBase.h b/libsecurity_smime/lib/SecCmsBase.h
index 0381c229..0111155b 100644
--- a/libsecurity_smime/lib/SecCmsBase.h
+++ b/libsecurity_smime/lib/SecCmsBase.h
@@ -35,12 +35,15 @@
 #ifndef _SECURITY_SECCMSBASE_H_
 #define _SECURITY_SECCMSBASE_H_  1
 
+#include <Security/SecBase.h>
 #include <Security/SecKey.h>
 #include <Security/SecAsn1Types.h>
 
+#if !SEC_OS_OSX_INCLUDES
 #if !USE_CDSA_CRYPTO
 typedef CFTypeRef SecKeychainRef;
 #endif
+#endif // ! SEC_OS_OSX_INCLUDES
 
 #if defined(__cplusplus)
 extern "C" {
@@ -423,7 +426,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,
@@ -444,19 +447,43 @@ typedef enum {
 
     SEC_OID_MS_SMIME_ENCRYPTION_KEY_PREFERENCE = 190,
 
-    SEC_OID_SHA256              = 191,
-    SEC_OID_SHA384              = 192,
-    SEC_OID_SHA512              = 193,
-
-    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_AES_128_KEY_WRAP	= 197,
-    SEC_OID_AES_192_KEY_WRAP	= 198,
-    SEC_OID_AES_256_KEY_WRAP	= 199,
-
-    SEC_OID_SHA224              = 200,
+    SEC_OID_SHA224              = 191,
+    SEC_OID_SHA256              = 192,
+    SEC_OID_SHA384              = 193,
+    SEC_OID_SHA512              = 194,
+
+    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	= 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		= 201,
+
+    /* ECDSA */
+    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 = 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 Attribute */
+    SEC_OID_APPLE_HASH_AGILITY = 214,
 
     SEC_OID_TOTAL
 } SECOidTag;